Fix thresholds
Merge branch 'Nadir' into ExoValDev

Use version before cms-merge-topic, with correct dimuon thresholds.