Fixes #7860 - added puppetssh_wait option