Fix naming collision between locally defined function phi and variable phi name
Adding back JEC producers for AK5CHS and AK7CHS
DQM/TrackingMonitorClient: add missing std::

The following is required for ROOT6.

Signed-off-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>
CommonTools/TrackerMap: add missing std:: in print_TrackerMap.cc

The following is required for ROOT6.

Signed-off-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>
Merge pull request #1960 from davidlt/add-missing-std-DQM-TrackingMonitorClient

Misc fixes -- DQM/TrackingMonitorClient: add missing std::
Merge pull request #1961 from davidlt/add-missing-std-CommonTools-TrackerMap

Misc fixes -- CommonTools/TrackerMap: add missing std:: in print_TrackerMap.cc
updating the memory references for whiteRabbit
adding patch to fix indexing problem of ?? as stable
adding patch for z+gamma bin
Added option to set gDebug from InitRootHandler's parameters
Merge pull request #1963 from inugent/HiggsValChannelPatch_7XY

Generator fix -- Patch for undertemined decay modes and adding Z+gamma mode in Generator Higgs Validation.
Merge pull request #1962 from deguio/updateMemoryRef

DQM fixes -- Updating the memory references for whiteRabbit tests
Merge pull request #1966 from Dr15Jones/optionToSetROOTDebugLevel

Framework fixes -- Added option to set gDebug from InitRootHandler's parameters
Merge pull request #1952 from vkuznet/Fix_RecoPixelVertexing

Fix naming collision between locally defined function and variable phi.
Close file after writing the init message.
Merge pull request #1985 from mommsen/closeIniFiles

DAQ updates -- Close file after writing the init message.
Merge pull request #1958 from rappoccio/rappoccio_700pre11_AddCHSJec

Bug fix : adding JEC producers for AK5CHS and AK7CHS
Fixed transient/persistent argument mixup

The classes declared in classes_def.xml were meant not to be stored, however,
the wrong XML argument name was used. The used name was 'transient' but the
code actually only looks for the name 'persistent'. This change corrects the error.
Merge pull request #1990 from Dr15Jones/fixNonPersisentClassesInPhysicsToolsFWLite

AT fix -- Fixed transient/persistent argument mixup
DataFormats/Histograms: rename `debug' macro to `METOEDMFORMAT_DEBUG'

The following is needed for ROOT6.

Signed-off-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>