Merge "Fix netconf-config-connector NetconfMappingTest"