CRM-14463 - Fix custom address fields to support location type
Merge pull request #2886 from colemanw/4.4

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