Merge branch 'cpack-nsis-fix-uninstall-quoting' into release-3.22

Merge-request: !7096