delete deaccented misspelling of Sao Paulo

Auditors: blackmad
respect name deletes for asciiname

Auditors: blackmad
Revert "delete deaccented misspelling of Sao Paulo"

This reverts commit 597b47e3f41c7bd1037d1bf462c4b4d65ef4f449.
Fix Jakarta name

Make DKI Jakarta ALT_NAME and Jakarta PREFERRED in English.

Auditors: blackmad
Merge remote-tracking branch 'upstream/master'