Eng 3217 merged

Bring eng_3217 branch up to date with VoltDB/voltdb repo master -- required a fair amount of hand edits -- compiled but not yet tested or fully reviewed.