master
8304911: Use OperatingSystem enum in some modules
8187443: Forest Consolidation: Move files to unified layout