master
8187443: Forest Consolidation: Move files to unified layout
8317631: Refactor ChoiceFormat tests to use JUnit
8318613: ChoiceFormat patterns are not well tested