Merge "bgpwtf/cccampix/peeringdb: allow multiple routers per peer"