Merge branch 'cutflowsvc1' into 'master'

Cleanup CutFlowSvc configuration a bit

See merge request !56255

(cherry picked from commit f323082f)

f6130257 Cleanup CutFlowSvc configuration a bit
1 job for cherry-pick-f323082f4f5-22.0 in 0 seconds (queued for 59 seconds)