master
8210039: move OSInfo to top level testlibrary
8187443: Forest Consolidation: Move files to unified layout