merge VoltDB:ENG-5333-guotong to your branch guotong1988:guotong before adding the hsql backend

 merge VoltDB:ENG-5333-guotong to your branch guotong1988:guotong before adding the hsql backend