Ryan's suggestions for ligher build
Merge branch 'lighter_esmf_build' into devel