EventContent fix for 71X
Merge pull request #4904 from Martin-Grunewald/EC71X

HLTrigger/Configuration -- EventContent fix for 71X
Merge remote-tracking branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X