Merge branch 'nsg-4.3' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3

Conflicts:
	build/modules.conf.in

diff --cc build/modules.conf.in
index e93ce2c677c091fef54da606570d7308735694ed,e17118c6f689fbbda02c9c557f74002c03486982..1d27aaad1bcdd6063ee74c2480b06000bdbf41c2
--- 1/build/modules.conf.in
--- 2/build/modules.conf.in
+++ b/build/modules.conf.in
@@@ -11,4 -13,5 +11,3 @@@ endpoints/mod_sofi
  xml_int/mod_xml_cdr
  event_handlers/mod_event_socket
  codecs/mod_sangoma_codec
 -#event_handlers/mod_radius_cdr
--