CRM-14463 - Fix custom address fields to support location type