Merge branch 'ATR-25932_myDevs' with title 'Additional b-jet calibration T&P, clean up egamma MC menu' into '22.0'
Additional b-jet calibration T&P, clean up egamma MC menu
See merge request !55145 (merged)
(cherry picked from commit e3107141)
412cca48 Additional b-jet calibration T&P, clean up egamma MC menu 84209def Additional b-jet calibration T&P, clean up egamma MC menu Updated
This MR was skipped from the 22.0 -> master merge. Bring it over manually now that the prior conflict is resolved