Port changes from QPID-2864 to trunk
Add producer configurable transaction timeouts
Robbie, can you review please?
I Noticed one bit of duplicate logic which I removed; this was probably just a merge artifact as it appeared to have been removed previously already.
User elements of the docs should really be moved to the docbook.