Merge "Add waiter for test_live_migration_with_trunk"