PROTON-183, PROTON-204: various fixes to get messenger tests working reliably

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