Merge branch 'releases.3.5' into nsg-4.3

diff --cc build/modules.conf.in
index 34ffb2121b2d6655a4bdebeec4fcac1ad7fc24da,1284bb8bc1d49681245184229a84acc5693e3808..c1de94b75f963a20198bd56ab255f934b3710e93
--- 1/build/modules.conf.in
--- 2/build/modules.conf.in
+++ b/build/modules.conf.in
@@@ -5,10 -5,9 +5,11 @@@ applications/mod_dptool
  applications/mod_commands
  applications/mod_hash
  applications/mod_spandsp
+ applications/mod_distributor
  dialplans/mod_dialplan_xml
  endpoints/mod_sofia
 +endpoints/mod_opal
 +endpoints/mod_media_gateway
  ../../libs/freetdm/mod_freetdm
  xml_int/mod_xml_cdr
  event_handlers/mod_event_socket

diff --cc libs/freetdm/mod_freetdm/mod_freetdm.c
Simple merge

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

diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
Simple merge

diff --cc src/switch_channel.c
Simple merge