Merge "Fix bug where FileUtils.deleteOlderFiles wouldn't delete the oldest files."