Merged in changes from trunk and updated examples accordingly.

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