Add and modify egamma triggers for ATR-21242, attempt2

Adding and modifying egamma triggers for ATR-21242, including changing L1_EM24VHI to L1_EM22VHI everywhere in TriggerMenuMT LS2_v1. L1_(2)EM15VHI is desired but not in L1 menus, so using L1_(2)EM15VH for now.

This follows the merged-and-reverted !32641 (merged) (thanks to a merge conflict then merging a problematic state from upstream)