Forward port CMSSW_7_0_X into CMSSW_7_1_X (Fixed Conflicts)

I continued with the forward port done here #4190

I fixed the conflicts that were in the file:
Configuration/PyReleaseValidation/python/relval_steps.py

I left what currently is in 7_1_X, I would like to know if this is correct.