Merged refs/pull/3973/head from repository cms-sw
introduced SLHCUpgradeSimulations/Configuration/postLS1CustomsPreMixing wherever needec by premix workflows; TEMPORARY
 --geometry Extended2015  as needs be in the 70x (all GT-driven in subsequent releases)
fix for correct handling of pathological cases of Pt=0 groomed jets
process string set to differentiate 25ns/50ns pilep overlaid when done with premixed events
HARVEST in place of HARVESTCOS
now discarding matches where two jets are too far apart
new premixed dataset as for https://hypernews.cern.ch/HyperNews/CMS/get/relval/2998.html
RECOPRMXUP15PROD
prod premix wf's given different label to avoid dataset collision; assure RECO of prod premix workflows use consistent GT
hltGetConfiguration: small clean up in the handling of Services
hltGetConfiguration: add the "--prescale" option to force using a given prescale column
argparse is included in the Python Standard Library since Python 2.7
Merge pull request #4110 from fwyzard/hltGetConfiguration_cleanup_70x

hltGetConfiguration cleanup for 7.0.x
Merge pull request #4001 from franzoni/from-CMSSW_7_0_X_2014-05-23-0200-premixPROD2

premix relvals: adapt to fixes of premixing
Merge pull request #3996 from cms-btv-pog/JetFlavourClusteringFix_from-CMSSW_7_0_X_2014-05-23-1400

Fix for jet flavour clustering: Backport from 7_1_X to 7_0_X
Merge branch 'CMSSW_7_0_X' into CMSSW_7_1_X (fixed conflicts)

Conflicts:
	Configuration/PyReleaseValidation/python/relval_steps.py
Merge pull request #4207 from nclopezo/fix-forward-port

Forward port CMSSW_7_0_X into CMSSW_7_1_X (Fixed Conflicts)