Merge "Replace GCC specific __thread with C++ 11 keyword thread_local" into devel...