synch with netcdf-c
conflict resolution on rebase master
Add svn changes to date
cf
delta 1
rename dap2 grammar and remove ce.y