master
8187443: Forest Consolidation: Move files to unified layout
8301991: Convert l10n properties resource bundles to UTF-8 native