Merge "Bug:1238 - Revert changes to SshClientAdapter."