MDLSITE-1363 First version of tools to merge en_fix into moodle.git