Merge pull request #1835 from ludovic-henry/referencesource-threadlocal-tests