Merge branch 'master' into smgmaster

diff --cc src/mod/applications/mod_commands/mod_commands.c
Simple merge

diff --cc src/mod/endpoints/mod_sofia/mod_sofia.c
Simple merge

diff --cc src/mod/endpoints/mod_sofia/mod_sofia.h
Simple merge

diff --cc src/switch.c
index 7abe1481d14a63b0ec756daaa4698aea9cbf58e9,b04243d59f156602d22707b741b94222dbfe63bd..ef69bee34e0c6fb1d1de877a6b32b823f134fe19
--- 1/src/switch.c
--- 2/src/switch.c
+++ b/src/switch.c
@@@ -48,9 -48,9 +48,9 @@@
  #include "private/switch_core_pvt.h"
  
  /* pid filename: Stores the process id of the freeswitch process */
 -#define PIDFILE "freeswitch.pid"
 +#define PIDFILE "sangoma-media-gateway.pid"
  static char *pfile = PIDFILE;
- 
+ static int system_ready = 0;
  
  /* Picky compiler */
  #ifdef __ICC
@@@ -343,8 -415,10 +415,11 @@@ int main(int argc, char *argv[]
                "\t-nort                  -- disable clock clock_realtime\n"
                "\t-stop                  -- stop freeswitch\n"
                "\t-nc                    -- do not output to a console and background\n"
+ #ifndef WIN32
+               "\t-ncwait                -- do not output to a console and background but wait until the system is ready before exiting (implies -nc)\n"
+ #endif
                "\t-c                     -- output to a console and stay in the foreground\n"
 +              "\t-base [basedir]        -- specify an alternate base dir\n"
                "\t-conf [confdir]        -- specify an alternate config dir\n"
                "\t-log [logdir]          -- specify an alternate log dir\n"
                "\t-run [rundir]          -- specify an alternate run dir\n"

diff --cc src/switch_console.c
Simple merge

diff --cc src/switch_core.c
Simple merge