Merge branch 'releases.3.3' into smgmaster

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

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

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

diff --cc src/switch.c
Simple merge

diff --cc src/switch_core.c
Simple merge