Fix workflow 510.0

Same fix as in #4473.
Merge pull request #4577 from ktf/fix-510-71X

Fix workflow 510.0
Merge remote branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X