Merge "Remove netconf-cli"