Merge branch 'master' into ENG-5986
Make the error message nicer
Add test cases for error message for extended varchar and varbinary
Merge branch 'master' of github.com:VoltDB/voltdb into ENG-5637-better-varchar-error-msg
Merge branch 'master' of github.com:VoltDB/voltdb into ENG-5637-better-varchar-error-msg
For ENG-6031, remove min txnid tracking from task log
Code clean up, resolve comments and remove null checks
Merge branch 'master' of github.com:VoltDB/voltdb into ENG-5637-better-varchar-error-msg
Fix broken rate limiting code
Do not serialize PARAMETERS attributes if there is no PARAMETERS. Refresh our planner base line
Merge pull request #1209 from VoltDB/plannertester-fix

Do not serialize PARAMETERS attributes if there is no PARAMETERS. Refres...
Fix for ubuntu1310
Merge pull request #1211 from VoltDB/fix-ubuntu1310-gcc481

Fix for ubuntu1310
Code indentation clean up and other changes related to comments
Merge branch 'master' of github.com:VoltDB/voltdb into ENG-5637-better-varchar-error-msg
Merge pull request #1207 from VoltDB/ENG-5637-better-varchar-error-msg

Eng 5637 better varchar error msg
Fix broken long op + discrete timeouts. Long ops shouldn't have the default timeout applied
Try and fix flaky junit test that has a race with a connection timing out
For ENG-6031, add the comments Izzy asked for
Merge pull request #1208 from VoltDB/ENG-6031

For ENG-6031, remove min txnid tracking from task log