Merged QPID-6031 (r1621767) to 0.30 from trunk

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