Misc fixes for HLT and development
Merged CMSSW_7_1_X from repository cms-sw
Merged refs/pull/3104/head from repository cms-sw
Misc fixes for HLT and development
Merge pull request #3123 from perrotta/HLTplusEcalFixes

HLT -- HLT plus ecal fixes