Update with changes done on the trunk between revision 6505-6573
Note that no changes related to changset [6593] has been integrated as the subroutine condveg_albedo do not exist in current version (CN-CAN)