Merge remote-tracking branch 'origin/70X_v2' into cat72x

Conflicts:
	CatProducer/plugins/CATElectronProducer.cc
	CatProducer/python/electronProducer_cfi.py
	DataFormats/interface/Electron.h