Merge "Bug fixes for netconf southbound plugin."