Merge branch 'releases.3.4' into releases.3.5

Conflicts:
	src/include/switch_channel.h
	src/switch_channel.c

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_handle.c
Simple merge

diff --cc src/switch_channel.c
Simple merge