Merge branch 'master' into smgmaster

Conflicts:
	libs/esl/fs_cli.c

diff --cc libs/esl/fs_cli.c
index 254365b3c9c0294c24b04b8d3603568ea87cfbaf,a70d63fab57471bcf50bc8b99b32423fba6e1cdb..5a52c630857febb9afcb876a915c6b236f713bdd
--- 1/libs/esl/fs_cli.c
--- 2/libs/esl/fs_cli.c
+++ b/libs/esl/fs_cli.c
@@@ -8,7 -8,7 +8,8 @@@
  #include <signal.h>
  
  #define CMD_BUFLEN 1024
 +#define PROMPT_PREFIX "sangoma-media-gateway"
+ static int WARN_STOP = 0;
  
  #ifdef WIN32
  #define strdup(src) _strdup(src)

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/switch_console.c
Simple merge

diff --cc src/switch_core.c
Simple merge