QPID-5031 merged to 0.24

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