Converted the patch in comment 22 to an MR

David Cameronrequested to merge
issue/drupal-3077149:3077149-duplicate-link-errors into 11.x

Closes #3077149

Merge request reports