DEV: added changes between r6505 and r6573. Changes in condveg.f90 in the trunk had to be implemented in albedo_surface.f90 in ORCHIDEE.CN.CAN