now works with JMeter
Cleanup
Merge branch 'master' into ENG-2789
For ENG-4339, change elastic UI about adding capacity
Merge pull request #548 from VoltDB/ENG-2789

Eng 2789
Merge pull request #549 from VoltDB/ENG-4339

For ENG-4339, change elastic UI about adding capacity
Remove redundant code.
ENG-4767: Add tests for NValue::castAndSortAndDedupArrayForInList(..)
Merge remote-tracking branch 'origin/master' into ENG-4767-matscan
ENG-4767: Fix whitespace fail.