Merge remote-tracking branch 'origin/hotfix-ocp-executable' into develop_integration_2020_w33

executables/main-ocp.c

@@ -1345,7 +1345,7 @@ int main ( int argc, char **argv ) {
   // end of CI modifications
   //getchar();
   if(IS_SOFTMODEM_DOFORMS)
-    load_softscope("enb");
+    load_softscope("enb", NULL);
 
   itti_wait_tasks_end();
   oai_exit=1;