Combined updates from UFS-dev PR325 and PR326#633

grantfirl merged 5 commits into

NCAR:mainNCAR/ccpp-scm:mainfrom

hertneky:ufs-dev-PR325hertneky/ccpp-scm:ufs-dev-PR325Copy head branch name to clipboard