master
8187443: Forest Consolidation: Move files to unified layout
8205454: & is displayed in some Swing docs