Trivial static fixes for thread safety
Merge remote-tracking branch 'official-cmssw/CMSSW_7_0_X' into threadSafetyStaticsCalibCalorimetry
Merge pull request #1286 from nclopezo/threadSafetyStaticsCalibCalorimetry

Multithreading fixes -- Trivial static fixes for thread safety for CalibCalorimetry