MDLSITE-1363 Add tools to merge en_fix into moodle.git