master
8187443: Forest Consolidation: Move files to unified layout
8290504: Close streams returned by ModuleReader::list