Merged r1549668 to 0.26 branch

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.26@1549850 13f79535-47bb-0310-9956-ffa450edef68
Merged r1549669 to 0.26 branch

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.26@1549851 13f79535-47bb-0310-9956-ffa450edef68
Merged r1549670 to 0.26 branch

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.26@1549852 13f79535-47bb-0310-9956-ffa450edef68
Merged r1549672 to 0.26 branch

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