Update packages:CaloTrkMuIdTools from upstream/21.2 to upstream/master via pseudo-merge
this merges CaloTrkMuIdTools from 21.2 but respects changes made in master. Tested to comppile in nigthly
this merges CaloTrkMuIdTools from 21.2 but respects changes made in master. Tested to comppile in nigthly