Move draws a line under a fractious relationship, which soured after the Mexican group backed a bid by Sacyr for the Spanish company