Merge "Resolve TODO in test: 'test_available_volume_retype_with_migration'"