master
8272805: Avoid looking up standard charsets
8187443: Forest Consolidation: Move files to unified layout