Fixed conflicts for merging NCAR v4.3.1 into main. Using a side-branch
to handle this, which will then get merged into main.

Note that the changes to the handling of surface emissions for water and
ice-friendly aerosol for Thompson were not accepted because they did not
seem to play well with the handling of these variables when pulled from
GEOS-5. This may need to be addressed later if non-GEOS-5 approaches are
used for QNWFA and QNIFA.