ENG-3915 - Merge fixes from notest-voltcli.
ENG-3915 - Merge fixes from notest-voltcli.

wolffcm/voltdb,flybird119/voltdb,kobronson/cs-voltdb,kumarrus/voltdb,zuowang/voltdb,zuowang/voltdb,wolffcm/voltdb,deerwalk/voltdb,VoltDB/voltdb,simonzhangsm/voltdb,paulmartel/voltdb,creative-quant/voltdb,flybird119/voltdb,migue/voltdb,kumarrus/voltdb,zuowang/voltdb,deerwalk/voltdb,creative-quant/voltdb,VoltDB/voltdb,paulmartel/voltdb,zuowang/voltdb,kobronson/cs-voltdb,migue/voltdb,simonzhangsm/voltdb,deerwalk/voltdb,flybird119/voltdb,deerwalk/voltdb,ingted/voltdb,kobronson/cs-voltdb,ingted/voltdb,kumarrus/voltdb,creative-quant/voltdb,ingted/voltdb,simonzhangsm/voltdb,migue/voltdb,kumarrus/voltdb,flybird119/voltdb,kumarrus/voltdb,deerwalk/voltdb,paulmartel/voltdb,wolffcm/voltdb,zuowang/voltdb,ingted/voltdb,wolffcm/voltdb,kumarrus/voltdb,kobronson/cs-voltdb,simonzhangsm/voltdb,zuowang/voltdb,migue/voltdb,paulmartel/voltdb,wolffcm/voltdb,simonzhangsm/voltdb,paulmartel/voltdb,wolffcm/voltdb,migue/voltdb,flybird119/voltdb,wolffcm/voltdb,paulmartel/voltdb,deerwalk/voltdb,wolffcm/voltdb,kumarrus/voltdb,simonzhangsm/voltdb,zuowang/voltdb,creative-quant/voltdb,VoltDB/voltdb,kumarrus/voltdb,kobronson/cs-voltdb,paulmartel/voltdb,flybird119/voltdb,zuowang/voltdb,ingted/voltdb,simonzhangsm/voltdb,deerwalk/voltdb,kobronson/cs-voltdb,creative-quant/voltdb,creative-quant/voltdb,flybird119/voltdb,ingted/voltdb,kobronson/cs-voltdb,ingted/voltdb,VoltDB/voltdb,VoltDB/voltdb,migue/voltdb,paulmartel/voltdb,migue/voltdb,flybird119/voltdb,creative-quant/voltdb,simonzhangsm/voltdb,creative-quant/voltdb,VoltDB/voltdb,migue/voltdb,kobronson/cs-voltdb,deerwalk/voltdb,ingted/voltdb,VoltDB/voltdb