Bug 979428: switch distinguished puppetmaster; a=orgonly