Splified the fix for ENG-3440 from the last version.
Splified the fix for ENG-3440 from the last version.

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