A strike threat at Diageo's UK production sites has been put on hold after the company negotiated a new proposal with workers over changes to pensions.