QPID-4672: XmlExchange unbind deadlock - merge fix from trunk to 0.22 branch.



git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1462254 13f79535-47bb-0310-9956-ffa450edef68