remove ESPrefers for v1 regressions
Merge pull request #2270 from lgray/egm_remove_esprefers

Reco fixes -- Remove ESPrefers for v1 EGM regressions
Merge remote branch 'origin/CMSSW_7_0_X' into CMSSW_7_0_X
Merge remote branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X