merge develop, some minor code review updates

common/config/config_load_configmodule.c

@@ -249,7 +249,7 @@ configmodule_interface_t *load_configmodule(int argc,
   }
 
   cfgptr = calloc(sizeof(configmodule_interface_t),1);
-  cfgptr->argv_info = calloc(sizeof(int32_t), argc);
+  cfgptr->argv_info = calloc(sizeof(int32_t), argc+10);
   cfgptr->argv_info[0] |= CONFIG_CMDLINEOPT_PROCESSED;
 
   if (OoptIdx >= 0) {

openair1/PHY/TOOLS/nr_phy_scope.c

@@ -33,7 +33,6 @@
 #define ScaleZone 4
 #define localBuff(NaMe,SiZe) float NaMe[SiZe]; memset(NaMe,0,sizeof(NaMe));
 
-int otg_enabled;
 
 const FL_COLOR rx_antenna_colors[4] = {FL_RED,FL_BLUE,FL_GREEN,FL_YELLOW};
 const FL_COLOR water_colors[4] = {FL_BLUE,FL_GREEN,FL_YELLOW,FL_RED};