Merge "Fix test_volume_migrate_attached to retype as admin"