#Deermine Bug: reworked
#removed unwanted code
Merge branch 'master' of https://github.com/deerwalk/voltdb