Changes for CMSSW_7_3_X