Merged l1t-devel-CMSSW_7_1_4_patch1 from repository cms-l1t-offline
Update Tau and EG iso algorithms to use 12x12s instead of jets