Merge branch 'master' into releases.3.5

diff --cc libs/esl/fs_cli.c
Simple merge

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/include/freetdm.h
Simple merge

diff --cc libs/freetdm/src/include/private/ftdm_core.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_core.c
Simple merge

diff --cc src/switch_loadable_module.c
Simple merge