Merge branch 'mk-delete-orphaned-routes-before-validation' into 'master'

Delete conflicting orphaned routes before validation

Closes #39551

See merge request gitlab-org/gitlab-ce!16242