Merge branch 'more-symlink-fixes' into 'master'

More symlink fixes

See merge request gitlab-com/migration!175
2 jobs for more-symlink-fixes in 23 seconds (queued for 4 seconds)
latest
Status Job ID Name Coverage
  Test
passed #2702533
references

00:00:21

passed #2702532
shellcheck

00:00:23