Merge branch 'gtest_discover_tests_timeout' into release-3.10

Merge-request: !1851