master
8358468: Enhance code consistency: java.desktop/macos
8187443: Forest Consolidation: Move files to unified layout