This MR sweeps the changes from https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/13385 and https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/9030 from 21.2 to master. These enable the usage of TCCs as inputs to the constituent modifier tools.