Merge topic 'revert-googletest-discovery' into release-4.4 5e5467bfc3 GoogleTest: Revert "Base on builtin command discover_tests" c0ef680605 GoogleTest: Avoid else after return Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !12448