Jpriscia updates to hlt2 di muon

This merge request should be handled together with !250 (closed) , but before it, to avoid merge conflicts and breaking the tests.