QPID-5673 : merge to 0.28 branch

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