Merge branch 'ENG-4441-remove-trial-license-from-kits' into release-3.1
Merge branch 'release-3.1'
ENG-4347: Resolve a possible MPI deadlock with only one partition
where the master dies before forwarding on the complete message and
the fate of a transaction is lost.
ENG-4391: Add a quick-n-dirty MP one-shot read benchmark of sorts to
voltkv.  Not exactly benchmark-y, but should be useful to demonstrate a
correctly functioning MP one-shot read optimization.
shut up shut up SHUT UP!

Inhibit dropping infinite stack trace files during ant junit.
Fix VEM JMX/RMI connection issue
Merge pull request #424 from VoltDB/elastic

Everything looks merged up and blue on elastic, bring it back to master to keep them from diverging
gc rollover settings in VEM, ENG-4417
fixed mixed lines
Merge branch 'master' of github.com:VoltDB/voltdb
ENG-4494: First stab at making @UpdateApplicationCatalog pro.
Not all error paths work well yet.
Tests only partly purged so far.
Merge pull request #423 from VoltDB/eng4391

Eng4391
Merge remote-tracking branch 'origin/master' into eng4347

Conflicts:
	src/frontend/org/voltdb/iv2/InitiatorMailbox.java
ENG-4347 merge fail.  Fixed.
ENG-4494: Fix the 6 failing community tests by moving some to pro and by making some condition on enterprise edition.
Merge branch 'master' of github.com:VoltDB/voltdb
Change the license to BSD, as was done in VoltDB/voltdb-client-python
commit b56a14e19ddd03d2f8908f3d0c58e46bc84b1431.
ENG-4494: Community edition gives friendlier error on UAC call.
Provisional text waiting for ajgent's update.
ENG-4494: Updating missing-UAC error with text from Andrew.
ENG-4314 Support JSON predicates in EE multiCOW.