master
8187443: Forest Consolidation: Move files to unified layout
8357728: Avoid caching synthesized names in synthesized parameters