Merged revisions 1511002,1511026,1511030 from trunk to 0.24

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