Backport of Qpid transport from master to 3.0 release stream