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

cdi.settings.in

@@ -56,16 +56,16 @@
     }
   },
   "features" : {
-    "enable_cdi_lib" : "@ENABLE_CDI_LIB@",
+    "enable_cdi_lib" : @ENABLE_CDI_LIB@,
     "grib"           : "@ENABLE_GRIB@",
     "cgribex"        : "@ENABLE_CGRIBEX@",
     "service"        : "@ENABLE_SERVICE@",
     "extra"          : "@ENABLE_EXTRA@",
     "ieg"            : "@ENABLE_IEG@",
-    "enable_mpi"     : "@ENABLE_MPI@",
-    "parallel_nc4"   : "@HAVE_PARALLEL_NC4@"
-    "enable_python"  : "@ENABLE_PYTHON_INTERFACE@",
-    "enable_ruby"    : "@ENABLE_RUBY_INTERFACE@",
+    "enable_mpi"     : @ENABLE_MPI@,
+    "parallel_nc4"   : @HAVE_PARALLEL_NC4@,
+    "enable_python"  : @ENABLE_PYTHON_INTERFACE@,
+    "enable_ruby"    : @ENABLE_RUBY_INTERFACE@
     "across"         : "@ENABLE_ACROSS@",
   }
 }