Merge "generateJsonI18n.php: replace i18n.php with a shim"