FS-5849 --resolve

Conflicts:
	src/mod/applications/mod_conference/mod_conference.c