PuppetSSH: Merge develop branch.