Merge "Bug 1239 - Clean up and refactor netconf-ssh client"