Merge branch 'cherry-pick-8fcd24cb [formerly a579121cd8]-21.1' into '21.1'

Sweeping !10962 from 21.1-dev to 21.1.
Fix the roi in the FTK bjet chains

See merge request atlas/athena!10999

(cherry picked from commit 6c5e9c0a [formerly 06231c037f1365b370510f977bee2190e4e5a12b])

9099dbec Merge branch '21.1-dev-ftkfix' into '21.1-dev'

Former-commit-id: b7cd5f1f