Properly find common router identities

If the first consensus had a router identity that the second consensus didn't
have, we got stuck with it.
Finish up navigation on both ends at the same time