Changes to get Vagrant build working.

Required testing two different ways of running 'ps' so we can
correctly determine if parserver is running on both MacOSX and Ubuntu.
Merge remote-tracking branch 'upstream3/master'