master
8187443: Forest Consolidation: Move files to unified layout
8343476: Remove unnecessary @SuppressWarnings annotations (client)