Merge "Add --supplementary flag to generateJsonI18n"