master
8187443: Forest Consolidation: Move files to unified layout
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests