master
8187443: Forest Consolidation: Move files to unified layout
8200530: '\r' is not supported as "newline" in java.util.jar.Manifest