MiniAOD part 2 (7.0.X version)

CMSSW 7.0.X equivalent of #3545
@arizzi @bendavid @lgray @gpetruc @ferencek