Hand forward port of CMSSW_7_1_X into CMSSW_7_2_X.

Notice that the changes relevant for HLT where dropped from the forward
port during the merge as requested by Martin.