Update the formula into voltdb-3.5
Make it simpler and cleaner.
Merge branch 'voltdb' into develop
Merge branch 'develop'