Various GRIB2 fixes.
Merge pull request #1329 from rhattersley/grib2-fixes

Various GRIB2 fixes.