Use paths consistent with 10gen package
Fix Puppet >=3.2 deprecation warnings