Merge "Fix test_migration_live throwing AttributeError."