Merge "Fix ssh.Client retval and deadlock danger LP#1038561"