Cleanup CutFlowSvc configuration a bit See merge request !56255 (cherry picked from commit f323082f) f6130257 Cleanup CutFlowSvc configuration a bit