Sync with develop branch for bug fix of canopy heat storage#89

cenlinhe merged 6 commits intomasterNCAR/noahmp:masterfrom

developNCAR/noahmp:developCopy head branch name to clipboard