Merge in QPID-3759 from trunk and fixes QPID-3982. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.8-release-candidates@1334484 13f79535-47bb-0310-9956-ffa450edef68