Merge topic 'remove-cmakeserverlib-references'

bf7e3124cb Remove stale references to CMakeServerLib

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