Merge proposals dependent on lp://qastaging/~djfroofy/txamqp/txamqp-return-handling

lp://qastaging/~djfroofy/txamqp/txamqp-return-handling has no merge proposals.