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/pio_client.c

@@ -216,7 +216,7 @@ cdiPioClientStreamDefTimestep_(stream_t *streamptr, int tsID)
 }
 
 void
-cdiPioClientSetup(int *pioNamespace_)
+cdiPioClientSetup(int *pioNamespace_, struct cdiPioConf *conf)
 {
   int pioNamespace = *pioNamespace_ = namespaceNew();
   int callerCDINamespace = namespaceGetActive();
@@ -237,6 +237,7 @@ cdiPioClientSetup(int *pioNamespace_)
   namespaceSwitchSet(NSSWITCH_CDF_DEF_TIMESTEP, NSSW_FUNC(cdiPioCdfDefTimestepNOP));
   namespaceSwitchSet(NSSWITCH_CDF_STREAM_SETUP, NSSW_FUNC(cdiPioClientStreamNOP));
 #endif
+  namespaceSwitchSet(cdiPioExtraNSKeys[cdiPioEKXmapNew], NSSW_FUNC(conf->xmap_new));
   namespaceSetActive(callerCDINamespace);
 }