Merge VOC (Juliette's version) for ORCHIDEE_OL modules into the trunk. Update orchidee.default files for all configurations.