TODO Item 5&7 plus code review comments plus bug fixes
Merge remote-tracking branch 'alexeev/eng_3038' into ENG-3038

Conflicts:
	src/frontend/org/voltdb/planner/SubPlanAssembler.java