Bug 979428: switch distinguished puppetmaster; a=orgonly
Merge default -> production

--HG--
branch : production