LPS-40218

For 6.2.x and EE 6.2.x.

Please backport for RC release.

Please see email for my explaination and design choice for the language keys