Merge branch 'FindThreads-revert-libc-pthread-flag' into release-3.21

Merge-request: !7025