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