Use country key instead of country value for user-country setting

Use the country code ($cldr key in $countries array) in the forms when setting the country option and saving it to the database so that it is unaffected by changes to the application language.