Combination of NRL PRs and UFS/dev #304#596

grantfirl merged 5 commits into

NCAR:mainNCAR/ccpp-scm:mainfrom

grantfirl:return-on-errorgrantfirl/ccpp-scm:return-on-errorCopy head branch name to clipboard