Merge "Fixed handshake issues with SSH Netconf client"