Maint/master/puppetdb 1 1 final touches