Dedupe should be aware of different location types

Currently dedupe does not differentiate between various location types when matching contacts - this means that if a profile has two different City fields, the first city will be used for matching (and will match any location type). We should fix that by making CRM_Dedupe_Finder::formatParams() not braindeadly strip -postfixes from address fields (it currently turns 'city-Primary' and 'city-2' into 'city'), but rather infer the proper location_type_id (if the postfix is an integer) or is_primary (if the postfix is '-Primary').

Scheduling for CiviCRM 3.1, as most CiviCRM installs use single address per contact (and so aren't really affected by this issue).