Implemented TODO items 3&6
Items 4&5 from the TODO list
Merge remote-tracking branch 'alexeev/eng_3038' into ENG-3038

Conflicts:
	tests/frontend/org/voltdb/planner/TestPlansJoin.java