#3604286 Use more composite key Upsert queries in core

mondrakerequested to merge
issue/drupal-3604286:3604286-use-more-composite into main

Closes #3604286

Merge request reports