QPID-5216 - Cleaned up the format of a router-id in the message annotations.


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