Merge "Fix issue where train files would not be deleted past TTL or when over file number limit."