Merge branch 'sh-fix-import-rake-task' into 'master'

Fix gitlab:import:repos Rake task moving repositories into the wrong location

Closes #40765

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