PROTON-260 : changes to reflect feedback from Rafi and Alan


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