ENG-6374: refactor for ENG-6374
Merge pull request #2 from VoltDB/ENG-6374

ENG-6374: refactor for ENG-6374