Danone's trademark dispute with Wahaha may have ended, but the fallout from the one of the most long-running and high-profile disputes between joint venture partners in the drinks sector will not disappear so easily.