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 ae38ab5fb834e888acf031b475fd1ac9fe2e9a76,a28baba6f076028fb243430a56d3becbade48b6b..7abe1481d14a63b0ec756daaa4698aea9cbf58e9
--- 1/src/switch.c
--- 2/src/switch.c
+++ b/src/switch.c
@@@ -464,13 -461,8 +462,8 @@@ int main(int argc, char *argv[]
                        known_opt++;
                }
  
-               if (local_argv[x] && !strcmp(local_argv[x], "-bf")) {
-                       bf++;
-                       known_opt++;
-               }
- 
                if (local_argv[x] && !strcmp(local_argv[x], "-version")) {
 -                      fprintf(stdout, "FreeSWITCH version: %s\n", SWITCH_VERSION_FULL);
 +                      fprintf(stdout, "Sangoma Media Gateway Version: %s\n", SWITCH_VERSION_FULL);
                        return 0;
                        known_opt++;
                }

diff --cc src/switch_console.c
Simple merge