Merge "Fix netconf ssh client"