master
8187443: Forest Consolidation: Move files to unified layout
8296957: One more cast in SAFE_SIZE_NEW_ARRAY2