Revert "Changes overwritten from upsteam master"

This reverts commit 153a7805f35c9590cbc151258ba9d5bb63266c60.
Revert "Revert "Changes overwritten from upsteam master""

This reverts commit 2b73ad4d7f4130411b312a854d10dc91e3a4a81d.
Added setter method so that it can be mapped to the JSON the RESTful
service consumes.
Check for country code being null