QPID-5068 - Added feature to allow for modification of Delivery Annotations
  - Added annotation for ingress router
  - Added annotation for trace


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