Bring puppetmaster up to date with what is actually deployed#36

jhesketh wants to merge 2 commits intorcbau:masterrcbau/puppet:masterfrom

jhesketh:masterjhesketh/puppet:masterCopy head branch name to clipboard