master
8187443: Forest Consolidation: Move files to unified layout
8299430: Cleanup: delete unnecessary semicolons in java.desktop module