attr_accessible :country_id is duplicated

[Fixes #3114]
Merge git://github.com/spree/spree