Merge "Remove duplicate netconf namespace constant"