Merge "Change "uk" to "gb" in COUNTRY_CODES." into jb-dev