updated the HCAL logical map code to reflect the change in HO ring-0 interface cards, installed during LS1
Update autoCond.py
Conflict solved

Updated all MC GTs migrating all tags to production. Updated HCAL conditions for SiPM photodetectors. Introduced GEM in DES19 GT.
Conflicts:
	Configuration/AlCa/python/autoCond.py
Update autoCond.py

Updated all MC GTs migrating all tags to production. Updated HCAL conditions for SiPM photodetectors. Introduced GEM in DES19 GT.
Requires the pull request abdoulline:HO_post-LS1 with software changes for the SiPM upgrade.
Remove statics
New accessor for L1 prescales in case of a complex Boolean L1 expression as L1 seed (HLTConfigProvider)
New accessor for L1 prescales in case of a complex Boolean L1 expression as L1 seed (HLTConfigProvider)
change Tracer::dumpContextForLabel into a vstring
change the parameter name to dumpContextForLabels and the internal data structure from std::vector<std::string> to std::set<std::string> to avoid the linear lookup
Merge pull request #1168 from fwyzard/Tracer_dumpContextForLabel_vstring

Multithreaded framework -- change Tracer::dumpContextForLabel into a vstring
Merge pull request #1164 from ktf/fix-statics-DQMServices-Core

Multithreaded fixes -- Make a few statics const in DQMServices/Core
Merge pull request #1162 from nclopezo/demmatia-update-autoconf.py

Alca update -- Update autoCond.py
Merge pull request #1165 from Martin-Grunewald/HLTConfigProvider

HLT update -- Hlt config provider
Merge pull request #1081 from jsturdy/sturdy-HCAL-LMAP-HO-ring-0

updated the HCAL logical map code to reflect the change in HO ring-0 int...
Merge remote-tracking branch 'origin/CMSSW_7_0_X' into CMSSW_7_0_X