now works with JMeter
Cleanup
Merge branch 'master' into ENG-2789
Merge pull request #548 from VoltDB/ENG-2789

Eng 2789