Merge topic 'cps-noconfig-fix' into release-4.1

58d9950842 CPS: Fix empty configuration field on noconfig builds

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