Groupe Danone and its Chinese venture partner, Hangzhou Wahaha, have called a truce on their long-running feud,