Fix compilation errors
Merge pull request #4592 from wmtan/FixCompilationErrors

Fix compilation errors (URGENT)
Merge remote branch 'origin/CMSSW_7_2_X' into CMSSW_7_0_X