Event registration dedupe fails to match phone

Event live registration dedupe ignores phone numbers when specified in matching rule.

Problem is due to regex match function in /CRM/Dedupe/Finder.php:formatParams($fields, $ctype)formatParams($fields, $ctype) which successfully changes fields like "email-5" to "email", and "postal_code-Primary" to "postal_code", but fails to change "phone-Primary-1" to "phone".

Patch is attached which additionally matches fields with the format "phone-Primary-1".