Merge branch 'cherry-pick-c8f9d5be [formerly 7abe2390d2]-21.1-dev' into '21.1-dev'

Sweeping !10781 from 21.1 to 21.1-dev.
Drop a few more tau trigger variables from Trigger EDM

See merge request atlas/athena!10851

Former-commit-id: b9eacb22c13dffba43cc6b2c0f51f9bd49e64b9e