Forward port of remaining CMSSW_7_2_X bits into CMSSW_7_3_X.

ah - never mind my comment.. yes - indeed - can be fixed when we re-enable the abort