Comment 1 for bug 1758409

#1 is handled already by the retry logic in instances.py:_wait_for_system, so I am only going to update _ssh_connect to not wait as long.

Running through full set of tests on all platforms on local system and test system before submitting merge proposal.