Resolve the conflicts and add support for top hash aggregate and local serial agg
Merge pull request #1450 from VoltDB/ENG-6548-serial-aggregate

Resolve the conflicts and add support for top hash aggregate and local s...