Stage-2: tau cluster merging improvement + e/g position fix
Merge branch 'l1t-devel-CMSSW_7_1_0_pre8' of github.com:cms-l1t-offline/cmssw into jbsauvan-l1t-devel-CMSSW_7_1_0_pre8