master
8187443: Forest Consolidation: Move files to unified layout
8057650: uniform error diagnostics for inconsistent inherited method signatures