Sweeping !23144 from 21.0 to 21.3. Fixing RHadron Hadronic Interactions and Stop/Sbottoms

Atlas Nightlybuildrequested to merge
cherry-pick-4dfd6b576a-21.3 into 21.3

Fixing RHadron Hadronic Interactions and Stop/Sbottoms

See merge request !23144 (merged)

Merge request reports