Merge "Fix XmlStreamUtils writing attributes."