Bug 803823: Port buildbot master manifests to PuppetAgain. r=dustin