Diageo has swapped a majority share of Cîroc vodka, one of the brands at the centre of a legal dispute with rap mogul Sean Combs, for a tequila brand backed by basketball star LeBron James.