Restore dependency-based ordering (6.1.3 side effect)

Florian Chometonrequested to merge
issue/migrate_tools-3572002:3572002-migrationdependencies.optional-ignored-since into 6.1.x

Closes #3572002

Merge request reports