Created CountryTypeWithAttributes

Created CountryTypeWithAttributes data type that adds the common
attributes to the country type. That is now used by CountryOfResidence
and CountryOfBirth.
Revert "Created CountryTypeWithAttributes"

This reverts commit 1e00fb4cb4fbef1226c18698ac3076ff1338c6c2.
Added CountryTypeWithAttributes

Added CountryTypeWithAttributes to address.xsd. CountryOfResidence and
CountryOfBirth now use this datatype.