Merge pull request #3930 from ntherning/fix-System.ServiceProcess