2021-December-12 - Prerelease - 2.6.497

Clean up temp files from map extraction (#9881)

If we are extracting a map and fail to replace the existing map on the file system,
this extracted map will hang out in /tmp. The prerelease server recently had 3GB of
content in /tmp, largely due to left over temp files.