Merge commit '700b6a2' into CMSSW_7_3_X

Conflicts:
	Configuration/PyReleaseValidation/python/relval_steps.py