QPID-5908: merge annotations into properties, don't replace existing elements

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