Merge branch 'master' of https://github.com/VoltDB/voltdb into ENG-4939-Index