BTW: The change causing the conflict in MuonRecoOneHLT (https://github.com/cms-sw/cmssw/pull/1106#issuecomment-26592135) resolved that issue at least there. It was ported to be an EDAnalyzer.