The MR 8046 (by @mspalla) in the athenaprivate1 repo was never swept to master. Doing this now in an entirely manual way. The code of CaloTopoClusterMaker has deviated so much from 21.0 that a patch file didn't work any more. This is mostly due to the CaloNoiseTool -> CondAlgo migration and the cleanup done at the same time.