Merge "Add missing file locks to deleteArchivedFiles.php"