Backout Bug 859799 - PuppetAgain buildbot masters won't reconfig because of missing sftp subsystem