A strike threat at Diageo's UK operations has been called off after union members accepted a compromise plan on pensions.