Sweeping !30845 from 21.0 to master. Allow more flexible options to retry simulation chains

Atlas Nightlybuildrequested to merge
cherry-pick-297ccd0fe4-master into master

Allow more flexible options to retry simulation chains

See merge request !30845 (merged)

Merge request reports