CC-5429 : importing file > 24 hours doesn't work
Merge branch '24hourfileimport' into 2.5.x