Merge branch 'lheinric_23_Apr_DerivationFrameworkTrigger_to_master' into 'master'

...vationFramework/DerivationFrameworkTrigger/CMakeLists.txt

...erivationFrameworkTrigger/python/TriggerMatchingHelper.py

...onFramework/DerivationFrameworkTrigger/python/__init__.py

...vationFramework/DerivationFrameworkTrigger/share/TRIG6.py

...vationFramework/DerivationFrameworkTrigger/share/TRIG7.py

...mework/DerivationFrameworkTrigger/src/BuildCombinations.h

...work/DerivationFrameworkTrigger/src/BuildCombinations.icc

...ationFramework/DerivationFrameworkTrigger/src/RangedItr.h

...rk/DerivationFrameworkTrigger/src/TriggerMatchingTool.cxx

...work/DerivationFrameworkTrigger/src/TriggerMatchingTool.h

...ger/src/components/DerivationFrameworkTrigger_entries.cxx