innue #20039: set state country in addressfields just like address
Merge pull request #267 from shackbarth/20039

issue #20039: set state country in addressfields just like address