Merge "Fixing netconf test in master"