master
8187443: Forest Consolidation: Move files to unified layout
8348986: Improve coverage of enhanced exception messages