Merge "Remove oslo.i18n entry from config-generator"