Cosmetic reorder of GRIB/CF map entries.

This PR ensures that the entries in the GRIB/CF maps are ordered consistently. There are **no** data changes.

This PR **must** be rebased once #852 has been reviewed and merged.