FS-5910 --resolve
Trailing space removed
clear before calling callback
revert
FS-5917 --resolve
opus drama stable edition
Minor code duplicatation removal.
Fixing printf arg mismatch
fifo tweaks for tracking user count
Allow proxy media on pickup endpoint
FS-5924 --resolve
add ring_wait callstate for devstate interface
remove_debug
FS-5844 --resolve
FS-5925 --resolve

Conflicts:
	src/mod/applications/mod_conference/mod_conference.c
FS-5844
add channel to logline
FS-5930 --resolve this should suppress the message
add channel logical direction

Conflicts:
	src/include/switch_channel.h
	src/switch_channel.c
FS-5935 --resolve this was broken from the initial check in FS-5524