QPID-4746, QPID-4747: Complete partial change in previous commit

merged from trunk r1468875


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