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

Conflicts:
	src/mod/endpoints/mod_media_gateway/mod_media_gateway.h

diff --cc src/mod/endpoints/mod_media_gateway/media_gateway.c
Simple merge

diff --cc src/mod/endpoints/mod_media_gateway/media_gateway_cmd_handler.c
Simple merge

diff --cc src/mod/endpoints/mod_media_gateway/mod_media_gateway.h
index f2ecbe002bc701bdb0a9964777301ef1807d72d7,03f03b5c2dac50f0e04c7226c9aa67e7889eae81..d74fb31d1e9ef687aa6342860ef9ea644a49ba82
--- 1/src/mod/endpoints/mod_media_gateway/mod_media_gateway.h
--- 2/src/mod/endpoints/mod_media_gateway/mod_media_gateway.h
+++ b/src/mod/endpoints/mod_media_gateway/mod_media_gateway.h
@@@ -153,7 -150,8 +154,9 @@@ struct megaco_profile_s 
        char*                                   rtp_termination_id_prefix;
        int                                             rtp_termination_id_len;
        char*                   peer_list[MG_MAX_PEERS];     /* MGC Peer ID LIST */
 +    char*                   codec_prefs;
+       int                                             inact_tmr;                   /* inactivity timer value */
+     uint32_t                inact_tmr_task_id;                 /* FS timer scheduler task-id */
      
      switch_thread_rwlock_t  *contexts_rwlock;
      uint32_t next_context_id;