HCOLL-187 ensure the size of the file and entries is tight for int->int and long->long.
Merge remote-tracking branch 'origin/master'