Forward port  of CMSSW_7_2_X into CMSSW_7_3_X

As requested by @civanch #5643 is ignored in this forward port.

Because the abort() in 73X was more recently merged than the continue in 72X.