Merge "XmlUtils#readThisMapXml should handle null keys."