Merge Country and OverseasTerritory WorldLocationTypes

These are now just to be called "World locations"
Add new keys to translation files
WIP
Migration, and fix tests
WIP
WIP
Moar
Fixed, finally