QPID-6044 : Merged to 0.30 branch from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1620708 13f79535-47bb-0310-9956-ffa450edef68
QPID-6066 : Merged from trunk onto the 0.30 branch

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