UI-915: Fixed different issues with the way i18n was loading its files
Merge remote-tracking branch 'origin/master'