NAS-2369: ArchiveFileDAOTester fails with surefire.
Merge branch 'NAS-2369'