Backports the Qpid work to the 3.0 release stream

This code is compliant with 2.6, and was originally designed to run against the 3.0 release stream.