CMake 3.15.0-rc1
Merge branch 'ctest_xml_tweaks' into release-3.15

Merge-request: !3423