Merge "Revert "Revert "Mark "test_live_migration_with_trunk" as unstable"""