Pulled in some important changes to the external Qpid Module