Merge branch 'master' into ENG-5573-prep

Conflicts:
	src/ee/execution/IPCTopend.cpp
	src/ee/execution/IPCTopend.h
Merge pull request #1076 from VoltDB/ENG-5573-prep

Eng 5573 prep -- code simplification