ENG-5374 fix.
ENG-5374 consolidate crash.
ENG-5374 fix.
Merge branch 'master' into ENG-5374
Merge pull request #903 from VoltDB/ENG-5374

Eng 5374