Fix import and proe-usage of billing.language
Map legacy account.billing_address_country to a country code (reqd for proe)