Merge Country and OverseasTerritory location types

These are now just to be called "World locations".

This involved considerable noise changing all the factory references to
remove calls out to country etc. in order to clean up.