Try paramiko connect after port 22 is up

Change-Id: I9da74ce0f9040724cb6e27f6f8691746d28783da
Merge remote-tracking branch 'upstream/master'