QPID-6079 : Merged revisions 1622961 1623055 from trunk to 0.30

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