The US kefir maker and French dairy giant have also agreed to “stay” the litigation between the two companies.