Merge commit 'develop' into feature-127-protocol-split

* remove a lot of white spaces
* many conflicts in enb_config.c

common/utils/msc/msc.c

@@ -37,7 +37,6 @@
 
 #include "liblfds611.h"
 #include "intertask_interface.h"
-#include "timer.h"
 
 
 

common/utils/msc/msc.h

@@ -65,6 +65,8 @@ typedef enum {
     MSC_F1AP_CU,
     MSC_F1AP_DU,
     MAX_MSC_PROTOS,
+    MSC_X2AP_SRC_ENB,
+    MSC_X2AP_TARGET_ENB,
 } msc_proto_t;