74 Port changes from 73 to 74

[alja]

This is a merge of development in 73:
git cms-merge-topic alja:cmsShow73-2

[alja]

+1

Before creating the PR I save the change is not automatically mergable. Let me know if there are any problems.

[cmsbuild]

A new Pull Request was created by @alja (Alja Mrak-Tadel) for CMSSW_7_4_X.

74 Port changes from 73 to 74

It involves the following packages:

Fireworks/Calo
Fireworks/Candidates
Fireworks/Core
Fireworks/Electrons
Fireworks/ParticleFlow
Fireworks/Tracks
RecoEgamma/EgammaHLTProducers

@Martin-Grunewald, @perrotta, @cmsbuild, @nclopezo, @fwyzard can you please review it and eventually sign? Thanks.
@Sam-Harper, @lgray this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
If you are a L2 or a release manager you can ask for tests by saying 'please test' in the first line of a comment.

[alja]

What is a test for merge ?
I have tried git cms-merge-topic and this one worked without an error.

[cmsbuild]

-1
@alja This pull request cannot be automatically merged, could you please rebase it?

[Martin-Grunewald]

Hi @alja
In your PR, get rid of your changes to
RecoEgamma/EgammaHLTProducers/src/EgammaHLTRechitInRegionsProducer.cc
these are already in 74X and thus cause (some of?) the merge conflicts (and also requires
HLT signature for your PR which should not be the case anyway).

[alja]

Thanks Martin,
I have rebased to 74 and don't see RecoEgamma changes anymore.

+1

[cmsbuild]

Pull request #7093 was updated. @cmsbuild, @alja, @Dr15Jones, @ktf, @nclopezo can you please check and sign again.

[cmsbuild]

+1
Tested at: 64e9322
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-7093/1808/summary.html