fixing merge conflicts
updated rake tasks for puppetdb config