Merge branch '39246-fork-and-import-jobs-should-only-be-marked-as-failed-when-the-number-of-retries-was-exhausted' into 'master'
Fork and Import jobs only get marked as failed when the number of Sidekiq retries were exhausted
Closes #39246
See merge request gitlab-org/gitlab-ce!15844
