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