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
Merge branch 'master' into pre-coverage
Fix expected error message typo
Merge pull request #736 from VoltDB/pre-coverage

Minor cleanups discovered during sqlcoverage rework. Passes jenkins.