Adding changes from Dylan for new dijet + jet mass trigger
Merge pull request #6185 from rappoccio/rappoccio_HLT_dijet_withmass

Adding changes from B2G for new dijet + jet mass trigger