Merge topic 'ctest-safe-build-id'

2aa2c9af97 ctest: Don't modify build and site names

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