Revert "Merge branch 'master-CaloTopoClusterCfg-v2' into 'master'"
This reverts merge request !21428 (merged)
This is an explorative revert MR to test a hypothesis about test failure.
I will touch the TrigUpgradeTest package to make sure we run all the CI tests from there too