Improve the duplicate locale data detection logic in the scripts.
Add country data.