Bug 979428: add new puppetmaster to configs; a=orgonly
Merge default -> production

--HG--
branch : production