Merge pull request #7 from cms-sw/CMSSW_7_1_X

Update my CMSSW_7_1_X with the official one
Merge pull request #12 from cms-sw/CMSSW_7_1_X

Merge cms-sw CMSSW_7_1_X into my CMSSW_7_1_X
Merge branch 'CMSSW_7_1_X' of github.com:venturia/cmssw into CMSSW_7_1_X
Merge branch 'CMSSW_7_1_X' of github.com:cms-sw/cmssw into CMSSW_7_1_X
updates for mva tracking 13TeV
Merge pull request #16 from cms-sw/CMSSW_7_1_X

update my CMSSW_7_1_X with the official one
Merge branch 'CMSSW_7_1_X' of github.com:cms-sw/cmssw into CMSSW_7_1_X
Merge branch 'CMSSW_7_1_X' of github.com:venturia/cmssw into CMSSW_7_1_X
fixed PF2PAT module names (added missing 'JME' string)
commented out unused parameter in the GenJetMatcher configuration
fixed problem with re-enabling b tagging in switchJetCollection() once it has been disabled
fixed adaptPV() (currently it was skipping b-tagging modules and modules
like pfElectronsFromVertex and pfMuonsFromVertex), also turned it into a more generic tool
new jet flavour definition
- migration to the consumes interface to make the code thread-safe

- minor code updates to make it work in 7_1_X (originally developed in 5_3_X)
minor tweaks to the config files
made PhysicsTools/JetExamples/test/printGenJetRatio.py functional again
updated handling of flavour conflicts
updated definition of parton-based jet flavour
added Sherpa to the list of supported generators
added Herwig++ to the list of supported generators