HPCC-9015 Restore previous ROLLUP semantics

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Community Edition 3.10.6-1rc Release Candidate 1

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Community Edition 3.10.6-1 Gold

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
wip