fixes #2669.txn queue polling with timeout.
checkstyle fixes
Merge pull request #2690 from eminn/fix/txnQueuePollTimeout-master

[forward-port] txn queue polling with timeout.