Merge "BUG-2600 Dynamic schemas in netconf server"