Merged l1t-devel-CMSSW_7_1_0_pre6 from repository cms-l1t-offline
Fixes for Tau and EG Stage1 algorithms