Merge branch 'cherry-pick-20b605f7 [formerly 46ef701e3d]-21.0' into '21.0'

Sweeping !14379 from 21.2 to 21.0.
Added flag for HI b-tagging reconstruction, with default to off

See merge request atlas/athena!14425

Former-commit-id: 34152d89f2a8d9ead98ce9f3bf4d77335f37ee4f