Upsert instead of merge in keyvalue and config storage.

Dave Longrequested to merge
issue/drupal-2755831:2755831-upsert-keyvalue-config into main

Closes #2755831

Merge request reports