Sweeping !32491 from 21.3 to 21.9. Manual sweep of !32419 from 21.0 to 21.3: Fix ISF bug affecting ATLFASTII job (ATLPHYSVAL-630)

Atlas Nightlybuildrequested to merge
cherry-pick-ed90e83661-21.9 into 21.9

Manual sweep of !32419 (merged) from 21.0 to 21.3: Fix ISF bug affecting ATLFASTII job (ATLPHYSVAL-630)

See merge request !32491 (merged)

Merge request reports