Merge "Fix sizing of the modunion table on small heaps"