master
8272120: Avoid looking for standard encodings in "java." modules
8187443: Forest Consolidation: Move files to unified layout