Merged CMSSW_5_3_11_ForHCALSourcing from repository sethcooper
fix compilation errors in 5_3_11.