code review from stoyan

Conflicts:
	EgammaAnalysis/ElectronTools/plugins/ElectronIDValueMapProducer.cc