master
8187443: Forest Consolidation: Move files to unified layout
8213330: Fix legal headers in i18n tests