Merge remote branch 'fsorig/master' into releases.3.5

Conflicts:
	build/modules.conf.in
	libs/freetdm/mod_freetdm/mod_freetdm.c

diff --cc libs/esl/fs_cli.c
index 7dfaf2d5a6e1556f8d64089dfca3b7f007401a39,408c946d299f88084bc50f04422d29591364aa10..febf6d85c57f20431c884bb645e760feb482474b
--- 1/libs/esl/fs_cli.c
--- 2/libs/esl/fs_cli.c
+++ b/libs/esl/fs_cli.c
@@@ -875,21 -901,31 +902,20 @@@ static const char *basic_gets(int *cnt
  #endif
        return command_buf;
  }
- #endif
  
 -static const char *banner =
 -      "            _____ ____     ____ _     ___              \n"
 -      "           |  ___/ ___|   / ___| |   |_ _|             \n"
 -      "           | |_  \\___ \\  | |   | |    | |            \n"
 -      "           |  _|  ___) | | |___| |___ | |              \n"
 -      "           |_|   |____/   \\____|_____|___|            \n"
 -      "\n"
 -      "*******************************************************\n"
 -      "* Anthony Minessale II, Ken Rice,                     *\n"
 -      "* Michael Jerris, Travis Cross                        *\n"
 -      "* FreeSWITCH (http://www.freeswitch.org)              *\n"
 -      "* Paypal Donations Appreciated: paypal@freeswitch.org *\n"
 -      "* Brought to you by ClueCon http://www.cluecon.com/   *\n"
 -      "*******************************************************\n"
 -      "\n"
 -      "Type /help <enter> to see a list of commands\n\n\n";
 -
  static void print_banner(FILE *stream)
  {
 -#ifndef WIN32
 -      fprintf(stream, "%s%s", output_text_color, banner);
 -#else
 -      fprintf(stream, "%s", banner);
 -#endif
 +      fprintf(stream,
 +                      
 +
 +                      "\n"
 +                      "*******************************************************\n"
 +                      "* Netborder SS7 Gateway                               *\n"
 +                      "* Powered by FreeSWITCH (http://www.freeswitch.org)   *\n"
 +                      "*******************************************************\n"
 +                      "\n"
 +                        "Type /help <enter> to see a list of commands\n\n\n"
 +                      );
  }
  
  static void set_fn_keys(cli_profile_t *profile)
@@@ -1423,11 -1466,12 +1461,14 @@@ int main(int argc, char *argv[]
                snprintf(cmd_str, sizeof(cmd_str), "log %s\n\n", profile->loglevel);
                esl_send_recv(&handle, cmd_str);
        }
+       if (global_profile->batch_mode) {
+               setvbuf(stdout, (char*)NULL, _IONBF, 0);
+       }
        print_banner(stdout);
 -      esl_log(ESL_LOG_INFO, "FS CLI Ready.\nenter /help for a list of commands.\n");
 +
 +      esl_log(ESL_LOG_INFO, "Netborder SS7 CLI Ready.\nenter /help for a list of commands.\n");
        output_printf("%s\n", handle.last_sr_reply);
 +
        while (running > 0) {
                int r;
  #ifdef HAVE_EDITLINE

diff --cc libs/freetdm/mod_freetdm/mod_freetdm.c
index b6a6f49ca1c02c41b1a37f006e82fb5e944b5345,35b8d9b01aa7401b1da260fc8aadc429b8a5ec00..7482f739936e5def8ff05ce759419d7ceed898f1
--- 1/libs/freetdm/mod_freetdm/mod_freetdm.c
--- 2/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@@ -26,8 -26,7 +26,8 @@@
   * Anthony Minessale II <anthm@freeswitch.org>
   * Moises Silva <moy@sangoma.com>
   * David Yat Sin <dyatsin@sangoma.com>
-  *
 + * James Zhang <jzhang@sangoma.com>
+  * Gideon Sadan <gsadan@sangoma.com>
   *
   * mod_freetdm.c -- FreeTDM Endpoint Module
   *

diff --cc libs/freetdm/src/ftdm_io.c
Simple merge

diff --cc libs/freetdm/src/ftdm_state.c
Simple merge

diff --cc libs/freetdm/src/include/freetdm.h
Simple merge

diff --cc libs/freetdm/src/include/private/ftdm_types.h
Simple merge

diff --cc src/include/switch_apr.h
Simple merge

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

diff --cc src/mod/applications/mod_spandsp/mod_spandsp.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
Simple merge

diff --cc src/switch_apr.c
Simple merge

diff --cc src/switch_console.c
Simple merge

diff --cc src/switch_core.c
Simple merge

diff --cc src/switch_core_session.c
Simple merge

diff --cc src/switch_loadable_module.c
Simple merge