SSH connection test now works if it can connect even without receiving the existing connection error. tcp_test_ssh now checks the return from the second socket.connect_nonblock and will return true if that connection attempt was successful.
Merge remote-tracking branch 'upstream/master'