master
8183743: Umbrella: add overloads that take a Charset parameter
8187443: Forest Consolidation: Move files to unified layout