HPCC-9015 Restore previous ROLLUP semantics

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>