Merge "Use channel_timeout for SSH connection timeout"