Merge pull request #24 from cms-sw/CMSSW_7_4_X

Synchronize CMSSW_7_4_X
Fix the declaration of beginRun to make it consistent with that of EDAnalyzer
Merge pull request #6899 from venturia/fix_sistripdetinfowriter

Fix SiStripDetInfoFileWriter::beginRun declaration and definition