Reintegrated modification done in [8183] with a correction necessary for case with OK_SNOW_ALBEDO_CLM3=n. Done by Christophe Dumas. See also ticket #887