ENG-5798 Clean up voltdb/voltadmin usage.
Merge pull request #1124 from VoltDB/notest-ENG-5798

ENG-5798 Clean up voltdb/voltadmin usage.