Merge branch 'cherry-pick-76b48e27' into 'releases/3.4'

Merge branch 'cleanup/unify-ug-guard-lecture-v3.4' into 'master'

See merge request !155

lecture/mm/convectivemixing/convmixproperties.hh

@@ -23,7 +23,7 @@
 #ifndef DUMUX_CONVMIXING_PROPERTIES_HH
 #define DUMUX_CONVMIXING_PROPERTIES_HH
 
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
 #include <dune/grid/uggrid.hh>
 #endif
 #include <dune/grid/yaspgrid.hh>