Correct issues that prevented compilation with NAG, and for which -wmismatch does not work or is overkill.
Merge branch 'master' of https://github.com/CESM-Development/netcdf-fortran into CESM-Development-master
Merge branch 'CESM-Development-master'