Merge "Use volume_id rather than volume_name in volume extensions timeout"