QPID-5041: ensure persistence id is not lost when annotation is added

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