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