fix for HARVESTUP15
Merge pull request #2169 from deguio/fixForHARVESTUP15

DQM -- Fix for HARVESTUP15
Merge remote branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X