Rename Castor jets
rename castor jets event content
rename castor jets skimming
remove iterativeCone5GenJets and switch to ak4GenJetsNoNu
revert PAT changes, remove ic5GenMET, fix gen jet sequence
revert pat changes, let tau validation produce own genjet collection
let tau validation produce own genjet collection
let tau validation produce own genjet collection
adapt event content
keep ak4GenJets for a pre-release until new relvals for PAT are available
keep ak4GenJets for a pre-release until new relvals for PAT are available
keep ak4GenJets for a pre-release until new relvals for PAT are available
remove genMetCaloAndNonPrompt from reco
Merged CMSSW_7_4_X from repository cms-sw
Merged refs/pull/6884/head from repository cms-sw

Conflicts:
	Validation/RecoJets/python/JetValidation_cfi.py
revert nonu switch
revert nonu part2
switch tau validation gen jets to ak4GenJets
replace IC5CaloJets as well
remove unnecessary includes from Geometry/GEMGeometry