Merge "netconf-ssh dependency cleanup"