Merge topic 'windows-manifest'

c97be5aefc cmake.version.manifest: Simplify XML specs
b5f4d7e7ea cmake.version.manifest: Make indentation consistent

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