Merge branch 'master' of https://github.com/VoltDB/voltdb into ENG-4939-Index
Merge branch 'ENG-4939-Index' of https://github.com/VoltDB/voltdb into ENG-4939-Index
Merge branch 'ENG-4939-Index' of https://github.com/zli236/voltdb into ENG-4939-Index
Changes according to John's review