21.9 from 21.3 Trigger L1Calo and Menu

Joerg Stelzerrequested to merge
stelzer/athena:21.9-resolve213sweep into 21.9

This brings in all the changes from 21.3 that are related to the upgrade of L1Calo and the trigger menu.

Edited by Joerg Stelzer

Merge request reports