fix: apply strategic merge to workspace-preferences-configmap

[akurinnoy]

What does this PR do?

This is a cherry-pick of #723

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: akurinnoy, artaleks9

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[devstudio-release]

Build 3.17 :: server_3.17/3: Console, Changes, Git Data

[devstudio-release]

Build 3.17 :: sync-to-downstream_3.17/32: Console, Changes, Git Data

[devstudio-release]

Build 3.17 :: get-sources-rhpkg-container-build_3.17/34: Console, Changes, Git Data

[devstudio-release]

Build 3.17 :: push-latest-container-to-quay_3.17/24: Console, Changes, Git Data

[devstudio-release]

Build 3.17 :: get-sources-rhpkg-container-build_3.17/34:

server : 3.17 :: Build 64795049 : quay.io/devspaces/server-rhel8:3.17-6
SUCCESS; copied to quay; /DS_CI/push-latest-container-to-quay_3.17/24 triggered

[devstudio-release]

Build 3.17 :: server_3.17/3:

Upstream sync done; /DS_CI/sync-to-downstream_3.17/32 triggered

[devstudio-release]

Build 3.17 :: update-digests_3.17/38: Console, Changes, Git Data

[devstudio-release]

Build 3.17 :: update-digests_3.17/38:

No new images detected: nothing to do!

[devstudio-release]

Build 3.17 :: server_3.17/4: Console, Changes, Git Data

[devstudio-release]

Build 3.17 :: sync-to-downstream_3.17/76: Console, Changes, Git Data

[devstudio-release]

Build 3.17 :: get-sources-rhpkg-container-build_3.17/78: Console, Changes, Git Data

[devstudio-release]

Build 3.17 :: push-latest-container-to-quay_3.17/64: Console, Changes, Git Data

[devstudio-release]

Build 3.17 :: get-sources-rhpkg-container-build_3.17/78:

server : 3.17 :: Build 65471470 : quay.io/devspaces/server-rhel8:3.17-7
SUCCESS; copied to quay; /DS_CI/push-latest-container-to-quay_3.17/64 triggered

[devstudio-release]

Build 3.17 :: server_3.17/4:

Upstream sync done; /DS_CI/sync-to-downstream_3.17/76 triggered

[devstudio-release]

Build 3.17 :: update-digests_3.17/205: Console, Changes, Git Data

[devstudio-release]

Build 3.17 :: update-digests_3.17/205:

No new images detected: nothing to do!