Merge "Make sure ssh retries on paramiko.SSHException"