Split off 3.10.6

3.10.6 was branched from 3.10.4 rather than candidate-3.10.x in order to
provide a single fix for the ROLLUP semantics change issue.

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