PROTON-393: applied (modified) patch from Bozo

git-svn-id: https://svn.apache.org/repos/asf/qpid/proton/trunk@1535439 13f79535-47bb-0310-9956-ffa450edef68