#3616155 - Duplicate key error in update_21001()

Pieter Frenssenrequested to merge
issue/node_revision_delete-3616155:3616155-update21001-backfill-fails into 2.1.x

Closes #3616155

Merge request reports