Merge branch 'tz/test-fix-pthreads-prereq'