master
8187443: Forest Consolidation: Move files to unified layout
8275342: Change nested classes in java.prefs to static nested classes