Merge "Rework NETCONF interfaces"