Run2 2017

Created by: rpatelCERN

Hey Kevin, Here are a few changes that include: Updating the scenarios.py for the _cff files for new 2017 collision datasets

Also I updated a few collection names based on the edm Collections in the latest data files.

I also updated the list of trigger names. Let me know if you have any questions or suggestions