Merge "BUG-1281: switch serialization to use StAX APIs"