correct and unify country codes for validation
keep the deprecated three-letter-code
Merge pull request #1191 from dereuromark/2.4-validation

correct and unify country codes for validation