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
allow for multiple conversion refs in track elements (bug in old pf algo was to repeat tracks)

Conflicts:
	RecoParticleFlow/PFProducer/src/PFEGammaAlgo.cc
Merge pull request #3532 from lgray/pfblockalgo_fixes_62XSLHC

PFBlockAlgo Fixes from #3385 and #3531