ENG-5368: fix timing hole?
ENG-5368: handle unexpectedFailure
ENG-5368: revert changes.
Merge pull request #1136 from VoltDB/ENG-5368

Eng 5368