Merge: from perso [2623:3024/perso/albert.jornet/ORCHIDEE-MICT].
It includes ORCHIDEE trunk changes [2247:2749:/trunk/ORCHIDEE] and lots of fixes.