Merge branch 'cherry-pick-7d670e3c' into 'run2-patches'

Add NoPID upstream muons (cherry pick for run2-patches)

See merge request !897
2 jobs for run2-patches in 30 seconds (queued for 1 second)