Merge "Preserve compression of xml files in convert"