Merge QPID-5646 fix r1584055 to 0.28

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