PuppetSSH: Merge develop branch.

not needed