Merge "Fix bad archive file names in ImportableUploadRevisionImporter"