Merge "Bug 4868 - Extend netconf-node-topology model to distinguish user overriden...