Added shipping_treat_as_country_id to model and form