master
8167252: Some of Charset.availableCharsets() does not contain itself
8187443: Forest Consolidation: Move files to unified layout