updates
more updates
more updates
updates
Merged topic_more_consumes from repository matteosan1
final updates
Merged CMSSW_7_1_X from repository cms-sw
Fix conflicts.
fix typo
Merge pull request #2497 from matteosan1/matteosan1/topic_more_consumes

Consumes migration -- Finalize migration to consumes for RecoEgamma/EgammaHLT*
Merge remote branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X