Merge pull request #4008 from gpetruc/miniAOD-from704-part3

MiniAOD part 3 (7.0.X version)
Merge remote branch 'origin/CMSSW_7_0_X' into CMSSW_7_0_X