Fix the matchers resolver in MatchesSolver job
Fix the matchers resolver in MatchesSolver job

Properly figure out how do we want to merge the contacts.
Not closing the bug since the GUI needs a similar fix. The important part
is fix fixed now, so we won't mess with the database.

CCBUG: 324814

detrout/libkpeople-debian,detrout/libkpeople-debian,detrout/libkpeople-debian