Manual sweep of !30899 (updates in MuonMomentumCorrections)

Hi,

this is a manual sweep of !30899 (merged) into 21.2 (some small changes which were made in master and are now propagated also to 21.2.

Best, Nico