Changed customisations to tell particle flow that the tracker has extended eta
Merge remote-tracking branch 'pr/3425' into merge3425
Included @dildick's suggested bugfix about paranthesis
Merge pull request #3420 from mark-grimes/addCustomisationWithoutEE

Add customisation without EE
Merge pull request #3477 from calabria/FixGlbRecoSLHC

FixForTheGlbRecoSLHC
Merge pull request #3476 from atricomi/new-dataloss

New behavior of DataLoss Ineff vs PU
Merge pull request #3432 from gem-sw/CSC-Trigger-Upgrade-GEM-RPC-forSLHC12

GEM-CSC-RPC integrated local trigger update
Merge pull request #3499 from mark-grimes/pullRequest3425WithDildicksMod

Pull request #3425 with @dildick's modification
Merge pull request #3498 from mark-grimes/customiseForwardPFLinking

Customise forward ParticleFlow linking
aaa
Switch the extended tracker to using particleFlowBlock2024_cfi
Make the changes by hand rather than loading from the cfi file. Otherwise get errors.
Merge pull request #3502 from mark-grimes/fixPFLinkingCustomisation

Fix ParticleFlow linking customisation
fix trackerLayerWithMeasurements and add method with max layer
fix variable names
Merge pull request #3507 from cerati/fix-hit-pattern-tk-layers-slhc

Fix hit pattern tk layers slhc
setup heavy ion reco to use new BlockAlgo config
add back in old behavior to not allow conv brems with bad pt resolution
fix bug in qcdphoton dqm where it assumed order of photons

Conflicts:
	DQM/Physics/src/QcdPhotonsDQM.cc
fix behavior of TrackFromParentImporter, shuffle around templating