Merged QPID-6050 to the 0.30 branch

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