QPID-4798: merged changes from trunk to 0.22 branch

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