code refactor related to issue:47160
Merge branch 'master' of https://github.com/deerwalk/voltdb