Update django-countries to 2.1.2, override country name for Taiwan
Merge pull request #5573 from edx/will/django-countries-fix

Update django-countries to 2.1.2, override country name for Taiwan