master
8187444: Forest Consolidation: Make build work
8187443: Forest Consolidation: Move files to unified layout