master
8187443: Forest Consolidation: Move files to unified layout
Merge
8240971: Fix CSS styles in some doc comments