Merge branch 'ENG-4441-remove-trial-license-from-kits' into release-3.1
Merge branch 'release-3.1'
Merge branch 'master' of github.com:VoltDB/voltdb
Merge branch 'master' of github.com:VoltDB/voltdb
Change the license to BSD, as was done in VoltDB/voltdb-client-python
commit b56a14e19ddd03d2f8908f3d0c58e46bc84b1431.