PROTON-508: applied patch from Timothy Bish

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