ENG-5497 fix valgrind.
For ENG-5516, fix CME
Merge pull request #960 from VoltDB/ENG-5516

For ENG-5516, fix CME
Change noprogresstimeout to be 6 minutes (deadlock timeout + 1 min).
ENG-5497 valgrind.
Merge pull request #962 from VoltDB/ENG-5497

Eng 5497
Code clean up and variable renaming according to Paul's suggestion
Merge branch 'master' of github.com:VoltDB/voltdb into ENG-4412-case-when-sqlfunction