Merged l1t-devel-CMSSW_7_1_0_pre7 from repository cms-l1t-offline
fix stage-2 tau clustering