Tkdetmap threadfix

Moved #3862 to CMSSW_7_2_X.