master
8187443: Forest Consolidation: Move files to unified layout
8301443: Clean broken comments from Windows code