Fix merge issues
Fix merge issues
Update post merge
Updated ssh_spec tests
Merge pull request #454 from ekrupnik/ssh_config

Customize ssh_timeout and ssh_retries