Manual merge 7_3_X into 7_3_ROOT6_X

Manual merge of CMSSW_7_3_X into CMSSW_7_3_ROOT6_X.