master
8292848: AWT_Mixing and TrayIcon tests fail on el8 with hard-coded isOel7
8187443: Forest Consolidation: Move files to unified layout