Merge branch 'master' of github.com:VoltDB/voltdb into ENG-3233-stringfunc
Merge branch 'ENG-3233-stringfunc' of github.com:VoltDB/voltdb into ENG-3233-stringfunc