Correctly handle label macros for Suomi NPP data. [1860]
fix for %level% macro

Note that _MappedGeoGridFlatField no longer actually inherits from
GeoGridFlatField

[1720]
Merge remote-tracking branch 'upstream/master' into inq1720_metadata