Merged CMSSW_7_2_X from repository cms-sw
Tau updates to the HLT run2 template menu
Merged hltRun2Updates from repository perrotta
Merged CMSSW_7_2_X from repository cms-sw
Merge pull request #4269 from perrotta/hltRun2Updates

HLT run2 updates
Merge remote branch 'origin/CMSSW_7_2_X' into CMSSW_7_0_X