master
8187443: Forest Consolidation: Move files to unified layout
8239965: XMLEncoder/Test4625418.java fails due to "Error: Cp943 - can't read properly"