Backport Tracking Particle fixes from CMSSW_7_0_X