Merge pull request #521 from DavidS/stub-ServiceInstaller-4-0