Puppetssh

Merge latest to puppetssh branch