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
HLT modifs for PFBlockProducer #3385

Conflicts:
	HLTrigger/Configuration/python/HLT_FULL_cff.py
	HLTrigger/Configuration/python/HLT_GRun_Famos_cff.py
	HLTrigger/Configuration/python/HLT_GRun_cff.py
	HLTrigger/Configuration/python/HLT_HIon_cff.py
	HLTrigger/Configuration/python/HLT_PIon_cff.py
	HLTrigger/Configuration/test/OnData_HLT_FULL.py
	HLTrigger/Configuration/test/OnData_HLT_GRun.py
	HLTrigger/Configuration/test/OnData_HLT_HIon.py
	HLTrigger/Configuration/test/OnData_HLT_PIon.py
	HLTrigger/Configuration/test/OnLine_HLT_FULL.py
	HLTrigger/Configuration/test/OnLine_HLT_GRun.py
	HLTrigger/Configuration/test/OnLine_HLT_HIon.py
	HLTrigger/Configuration/test/OnLine_HLT_PIon.py