Merged l1t-devel-CMSSW_7_2_0_pre6 from repository cms-l1t-offline