Maint/master/puppetdb fixups

Fixups for Puppetdb and future PE/FOSS hybrid projects.