master
8324598: use mem_unit when working with sysinfo memory and swap related information
8187443: Forest Consolidation: Move files to unified layout