Merge "Added display name overrides for non-DST version of Brazilian time zones" into jb-mr2-dev