Merge "BUG-1718 Fix missing attributes for empty nodes in XmlStremUtils"