Enables to build ESMF even with ESGF=ON if user passes CDAT_BUILD_ESMF_ESMP=ON
Merge branch 'esgf_and_emsf_in_one_build' into devel
Merge branch 'master' of github.com:UV-CDAT/uvcdat-devel into devel