Merge "Bug 5825: Migrate restconf to the new XML parser #2"