Merge "Refactor netconf-util's configuration service"