master
8187443: Forest Consolidation: Move files to unified layout
8223254: DataOutputStream/WriteUTF.java fails due to "OutOfMemoryError: Java heap space"