master
8187443: Forest Consolidation: Move files to unified layout
8353714: [17u] Backport of 8347740 incomplete