Consolidation with CDI-PIO (develop)

Generally, this is !11 (merged) rebased onto the develop branch.

This is the first develop-based version accepted by the Buildbot of ICON: https://buildbot.dkrz.de/grid?branch=m300488/cdi-pio-2-integration

src/stream_cdf_o.c

@@ -1444,7 +1444,7 @@ cdf_def_zaxis_hybrid_cf(stream_t *streamptr, int type, int *ncvaridp, int zaxisI
   }
 
   size_t len = 0;
-  char txt[CDI_MAX_NAME];
+  char txt[CDI_MAX_NAME * 2 + 30];
   if (p0status == 0)
     len = (size_t) (snprintf(txt, sizeof(txt), "%s%s %s%s", "a: a b: b p0: ", p0name, "ps: ", psname));
   else