Updated with merge from trunk r1577806

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