master
8187443: Forest Consolidation: Move files to unified layout
8364673: Remove duplicate font mapping for itcavantgarde in psfontj2d.properties