ENG-5798 Clean up voltdb/voltadmin usage.