Sweeping !62082 from 21.6 to master. MGC: updates to SUSY includes for 5FS and mixing matrix helper function

Atlas Nightlybuildrequested to merge
cherry-pick-95cd0c2e703-master into master

MGC: updates to SUSY includes for 5FS and mixing matrix helper function

See merge request !62082 (merged)

Merge request reports