Misc. cleanup motivated by sql-coverage testing.
junit test tweak after bad merge.
Merge branch 'master' into pre-coverage
Merge branch 'master' into pre-coverage
Misc. prep to get the reworked sqlcoverage to pass. Includes join rework.
Merge branch 'master' into pre-coverage

Conflicts:
	tests/frontend/org/voltdb/planner/TestPlansJoin.java
First set up on Java level to support complex group by for materialized view feature
Merge branch 'master' into pre-coverage
Fix expected error message typo
Fix ENG-5076
Add support for materialized view complex group by feature.
Merge branch 'master' into ENG-3613-complex-groupby-mv
ENG-5106: reduce use of getSiteTrackerForSnapshot() in SnapshotSaveAPI
Record info to be able to optimize in future
Merge branch 'master' of github.com:VoltDB/voltdb into ENG-3613-complex-groupby-mv
Changes for Paul's quick code review
Add test case for mixed group by columns
Merge branch 'master' of github.com:VoltDB/voltdb into ENG-3613-complex-groupby-mv
Refix for Paul's review
Add support for queries not include group by columns in display columns