Add rebased changes from previous MR

Dieter Holvoetrequested to merge
issue/drupal-3075230:3075230-provide-menu-link-11.x into main

Closes #3075230

Merge request reports