Fix C++ thread locals, add a test (#611)

Fix C++ thread locals, add a test (#611) #1121