master
8187443: Forest Consolidation: Move files to unified layout
8190382: fix small typographic errors in comments