Manual sweep of !30617 into master (Add resolution categories)

Nicolas Koehlerrequested to merge
nkoehler/athena:mstSwp2 into master

Hi,

the automatic sweep from 21.2 into master failed, since there were conflicts with the std::abs vs. std::fabs handling.. (not your fault @mkbugge). I resolved the conflicts and now do the manual sweep of !30617 (merged) into master here.

Best, Nico

Merge request reports