Clobber TriggerAPI with 21.1 version
Fully clobber TriggerAPI since some of the sweeps didn't make it to master
https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/15034 https://gitlab.cern.ch/atlas/athenaprivate1/merge_requests/14588
Includes a fix after !23622 (merged) had to be reverted