DISPATCH-54 - Moved message metadata from the delivery annotations to the message annotations.


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