Merge "Fix duplicate ref of volume_types_client in vol tests"