Compatibility with PuppetServer

https://tickets.puppetlabs.com/browse/SERVER-40