Merge "make XmlDumpwriter more resilient to blob store corruption"