Fixes #3474: Move r27899 to v1.7 branch

---svn-pre-commit-ignore-below---

r27899 [[BR]]
Correct the computation of the daemon vpid

cmr:v1.7