Merge a few PR already into CMSSW_7_2_X in CMSSW_7_3_X

This is up to a conflicting PR currently found in CMSSW_7_2_X.