master
8187443: Forest Consolidation: Move files to unified layout
8212795: ThreadInfoCompositeData.toCompositeData fails to map ThreadInfo to CompositeData