Bug 825056: self-host with puppet-3.2.0

TODO: simplify rsync