HCOLL-251 Re-tune the estimates for number of segment and how much entry headroom to use.
Merge remote-tracking branch 'origin/master'