Merge "Fix and update i18n QUnit test breakages"