Merge "Add netconf-util tests and remove unused classes"