Merge "Fix AttributeError in wait_for_volume_retype"