Merge pull request #1532 from mbertrand/services_gn

Services as core module
fixes issue 799-windows upload file locking
Merge pull request #1536 from nathanhilbert/windowsupload-799

Windows upload 799