NOREF: Since we are now using puppet open source, let's keep puppetdb and postgresql up-to-date
NOREF: Left too much stuff at the end of my password
NOREF: Fixing a couple syntax issues with hiera hashes so create_resources works
NOREF: Merging the latest develop branch changes to test
NOREF: Merging the latest develop branch changes to test