Merge branch 'fix-migration-paths' into 'master'

Fix migration paths

This fixes `migration paths` failure, preventing the `knapsack` from auto-balancing test suites:
https://gitlab.com/gitlab-org/gitlab-ce/builds/6485942

cc @stanhu

See merge request !7640