master
8198899: Compilation errors in java.prefs with VS 2017
8187443: Forest Consolidation: Move files to unified layout