master
8293432: Use diamond operator in java.management
8187443: Forest Consolidation: Move files to unified layout