Encode di-tau in HFRings; adjust HfRing scale for di-tau threholds
Merge branch 'l1t-devel-CMSSW_7_3_0_pre1' of github.com:cms-l1t-offline/cmssw into mydevel-branch