Making automatic contact aggregation even more conservative.

Also bringing back Jaro-Winkler distance calculator, which was emasculated by CL 22788
The Jaro-Winkler distance is actually very useful for generating
manual join suggestions.  It will not be used for automatic aggregation.

Change-Id: I7844efbcc1e0f9265f9fc8c56af8772282879f5f
5 files changed