QPID-5045 - Added additional indexing for inter-router links.
QPID-5201 - Fixed compile issues under "Release" builds.


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