Editing the country list in a language does not change the list in-site

When doing the following

• Log in as admin
• Go to administration
• Language
• Language editing
• Edit words or phrases
• Countries.php

• Find Taiwan, Prov...
• Remove the ', Prov...' bit
• Press 'Save countries.php'

Here the differences start. On the live server it says

Changes saved (C:\data\languagehouse\moodledata/lang/en_utf8_local/countries.php)

However it also says

No missing strings

On the test server it says

Changes saved (C:\wamp\moodledata/lang/en_utf8_local/countries.php)

However it also says

Number of missing strings: 1

Taiwan is highlighted green as a missing string and DOES have the new edited text.

The trouble is that this still doesn't change the country list in edit profile.

[What needs to change]

In moodlelib.php around line 5739

if (!file_exists($CFG->dirroot .'/lang/'. $lang .'/countries.php') &&
!file_exists($CFG->dataroot.'/lang/'. $lang .'/countries.php')) {

Must change to

if (!file_exists($CFG->dirroot .'/lang/'. $lang .'/countries.php') &&
!file_exists($CFG->dataroot.'/lang/'. $lang . '_local' . '/countries.php')) {

OR

When creating the folder in moodledata\lang the file should be called en_utf8 instead of en_utf8_local