Merge "BUG-1281: rework XmlStreamUtils a bit more"