QPID-5068 - Fixed a bug in the replacement of delivery annotations.


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