Report full product version, including -pN
(cherry picked from commit feefcc31b78c1ef99ffd9deb509b05ccdb1e61ef)
Report full product version, including -pN
(cherry picked from commit feefcc31b78c1ef99ffd9deb509b05ccdb1e61ef)