Merge "Clean-up config-netconf-connector"