Improvements to near match resolution

Rather than only using the title match or the redirect match when resolving
near matches, this uses both.  It also takes into account multiple redirects,
incase multiple pass.

Bug: 64185
Change-Id: Ifee9d8a679bf87bdd6d48924f9b784403411e088
Merge "Improvements to near match resolution"