[SP-1338] - Backport of MONDRIAN-2107 - Incorrect segment rollup with overlapping segments (4.8)