master
8187443: Forest Consolidation: Move files to unified layout
8296945: PublicMethodsTest is slow due to dependency verification with debug builds