Merge topic 'ctest-remove-redundant-code'

a9aecb59a8 cmTestGenerator: Don't override without adding functionality
67ef6bfd70 CTest: Remove code duplication

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11710