master
8307547: Support variant collations
8301991: Convert l10n properties resource bundles to UTF-8 native