Merge "Clean-up netconf-client"