Merge branch 'FindGTest-gmock-needs-gtest' into release-3.23

Merge-request: !7523