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

tests/Makefile.am

@@ -129,7 +129,7 @@ test_cdf_write_SOURCES = \
 test_resource_copy_mpi_SOURCES = test_resource_copy_mpi.c
 
 clean-local:
-	-rm -f *.grb *.grb2 *.nc *.nc2 *.nc4 *.srv *.ext *.cksum *.ieg *.log *.stderr *.stdout
+	-rm -f *.grb *.grb2 *.nc *.nc2 *.nc4 *.srv *.ext *.cksum *.ieg *.stderr *.stdout
 	-rm -rf *.dSYM
 
 AUTOMAKE_OPTIONS = color-tests