Conflicts:
	libs/sofia-sip/.update

FS-10908: [mod_amqp] AMQP routing key (format_fields) formation broke and invalid reads reported by valgrind #resolve

FS-10865: [mod_conference] conference transfer event reports incorrect info in New-Conference-Name #resolve

FS-10749: [mod_amqp] Crash on unload after mod_amqp reloaded with  command + incorrect command behavior #resolve

FS-10867: [freeswitch-core] Prevent stack smash when queing multiple sound files without event-lock #resolve

FS-10860: [core] Distorted music when playing it as local stream into a conference as hold music #resolve

FS-10854: [mod_conference] Canvas FG Image not refreshed before writing to video recordings #resolve

FS-10803: [mod_conference] Add support for alternate video layout config per conference profile #resolve