master
8187443: Forest Consolidation: Move files to unified layout
8271456: Avoid looking up standard charsets in "java.desktop" module