Merge "Add prefixes to type attribute in generated xml from netconf Add support for...