master
8187443: Forest Consolidation: Move files to unified layout
8234147: Avoid looking up standard charsets in core libraries