Merged from-CMSSW_5_3_7 from repository ajgilbert
[Patch] EgammaAnalysis/ElectronTools/test/ElectronAnalyzer.cc should use modified namespace to avoid conflicts