Merge again Muon/MuonAnalysisTools in CMSSW