JAL-3141 fix up merge artefact so BackupFilesTest passes