Merge "Bug 8939: Extract MapEntryNode from MapNode result of XML parsing"