Changed PuppetMaster and supporting classes