QPID-5068 - Beefed up the the annotation test and fixed an additional exposed bug.


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