Another migration to fix tracking
Merge pull request #3665 from Martin-Grunewald/AnotherMigrationToFixTracking

HLT -- Another migration to fix tracking
Merge remote branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X