KLM-Air France deal all but done