master
8187443: Forest Consolidation: Move files to unified layout
8312165: Fix typos in java.desktop Swing