Merge remote-tracking branch 'origin/develop' into x2

Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/ENB_APP/enb_app.c
	openair2/X2AP/x2ap_common.h

targets/COMMON/create_tasks.c

@@ -22,7 +22,7 @@
 #if defined(ENABLE_ITTI)
 # include "intertask_interface.h"
 # include "create_tasks.h"
-# include "log.h"
+# include "common/utils/LOG/log.h"
 
 # ifdef OPENAIR2
 #   if defined(ENABLE_USE_MME)
@@ -32,6 +32,8 @@
 #     include "nas_ue_task.h"
 #     include "udp_eNB_task.h"
 #     include "gtpv1u_eNB_task.h"
+#   else
+#     define EPC_MODE_ENABLED 0
 #   endif
 #   if ENABLE_RAL
 #     include "lteRALue.h"
@@ -60,8 +62,8 @@ int create_tasks(uint32_t enb_nb)
       return -1;
     }
   }
-
-#   if defined(ENABLE_USE_MME)
+# if defined(ENABLE_USE_MME)
+  if (EPC_MODE_ENABLED) {
       if (enb_nb > 0) {
         if (itti_create_task (TASK_X2AP, x2ap_task, NULL) < 0) {
           LOG_E(X2AP, "Create task for X2AP failed\n");
@@ -90,8 +92,8 @@ int create_tasks(uint32_t enb_nb)
         }
       }
 
-#      endif
-
+  } /* if (EPC_MODE_ENABLED) */
+#endif
     if (enb_nb > 0) {
       LOG_I(RRC,"Creating RRC eNB Task\n");