Merge "Bug 6681: Fix md-sal netconf edit-config behavior"