Merge pull request #6012 from cms-analysis-tools/CMSSW_7_3_X_AT_genHFHadronOrigin

GenHFHadronMatcher using the official JetFlavour tool for hadron-jet association
Merge pull request #6297 from cms-analysis-tools/7_2_X_GenHFHadronMatcher

Merge pull request #6012 from cms-analysis-tools/CMSSW_7_3_X_AT_genHFHad...