ENG-6152 prevent segv
Merge pull request #1286 from VoltDB/ENG-6152-elastic-truncate

ENG-6152 prevent segv
Merge branch 'master' into fourtwo-integration