master
8187443: Forest Consolidation: Move files to unified layout
8337506: Disable "best-fit" mapping on Windows command line