Merged noTTRHMerged2 from repository VinInn
fix regression, use less accurate CPE as in release
fix regression in lone TEC hit for global muons