#3586760 Use composite key Upsert queries in core

mondrakerequested to merge
issue/drupal-3586760:3586760-use-composite-key into main

Closes #3586760

Merge request reports