commit updates after getting things working after merges from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/proton/branches/fadams-javascript-binding@1577504 13f79535-47bb-0310-9956-ffa450edef68