PROTON-576: updates to bring things into line with the patch on the JIRA, rather than a stale older version I actually applied (not having a good day :P)

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