ENG-5616 fix indexing of self-joins
Merge branch 'master' into ENG-5616-selfjoins
Merge branch 'master' into ENG-5616-selfjoins
Merge remote-tracking branch 'origin/ENG-5616-selfjoins' into ENG-5616-selfjoins
Merge branch 'master' into ENG-5616-selfjoins
Fix for ENG-5816 NPE with test case.
ENG-5798 Clean up voltdb/voltadmin usage.
ENG-5631 Made PartitionProcessor to wait for new data.
Merge branch 'master' into ENG-5631-SlowCSVLoader
ENG-5616 Confirm group by fix with new test case
Merge branch 'master' into ENG-5616-selfjoins
Also refresh plannertester baseline.
Conflicts:
	src/frontend/org/voltdb/planner/ParsedSelectStmt.java
	src/frontend/org/voltdb/planner/PlanAssembler.java
	tests/frontend/org/voltdb/planner/TestPlansGroupBy.java
	tests/frontend/org/voltdb/planner/TestSelfJoins.java
Merge pull request #1109 from VoltDB/ENG-5616-selfjoins

ENG-5616 fix indexing of self-joins and grouping based on index ordering
Merge pull request #1129 from VoltDB/ENG-5631-SlowCSVLoader

ENG-5631 Made PartitionProcessor to wait for new data.
Merge pull request #1124 from VoltDB/notest-ENG-5798

ENG-5798 Clean up voltdb/voltadmin usage.
ENG-5616 Correct and beef up index selection tests
ENG-5774 and (dup) ENG-4736 one-liner to avoid updateCatalog NPE deep within hsql re-init
Merge pull request #1130 from VoltDB/ENG-5774-intermittent-hsql-npe

ENG-5774 and (dup) ENG-4736 one-liner to avoid updateCatalog NPE deep wi...
Fix the Union query hangs problem in SQL Coverage
merge self join with index feature and resolve the conflicts