ENG-5573 re-enable faster progress counter
Merge branch 'master' into ENG-5573-progress
Merge pull request #1084 from VoltDB/master

Back-merge from master (for cleaner pull request)
Merge branch 'master' into ENG-5573-progress
ENG-5573 increase inlining for brevity
Merge branch 'master' into ENG-5573-progress
Merge remote-tracking branch 'origin/ENG-5573-progress' into ENG-5573-progress
Merge pull request #1085 from VoltDB/ENG-5573-progress

Eng 5573 progress
ENG-5702.  Change heapmax to take integer or full -Xmx for input
Merge pull request #1098 from VoltDB/ENG-5702-heapmax

ENG-5702.  Change heapmax to take integer or full -Xmx for input
ENG-4324 Infinite voltadmin default procedure call timeout.
Fix according to Paul's comments. Code clean up and fix for nestloop index join
Merge branch 'master' of github.com:VoltDB/voltdb into ENG-391-experiment