allow to disable the CSCs in the places where the CSCIdHelper is created in a hardcoded way

Nicolas Koehlerrequested to merge
nkoehler/athena:cherry22540 into master

Hi,

since this !22540 (merged) MR could not be sweeped into the master @jchapman asked me to manually put the changes into the master. For further information please look at !22540 (merged)

Merge request reports