FS-10031: [mod_conference] Personal canvas mode doesn't switch layouts properly when a group is specified #resolve

Conflicts:
	libs/sofia-sip/.update

FS-9206: [core] endable proxy media auto-adjust on re-invite for text and video every time as the streams may be being added on re-invite

Conflicts:
	src/switch_core_media.c

FS-9990: [freeswitch-core] Exhaust fmtp sensitive codecs before moving on with negotiation in video #resolve

Conflicts:
	src/switch_core_media.c

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

FS-10012 [mod_callcenter] Enabling bypass media if agents leg have bypass_media_after_bridge=true #resolve

   fax_t38_tx_reinvite_packet_count - overrides t38-tx-reinvite-packet-count param in spandsp.conf
   fax_t38_rx_reinvite_packet_count - overrides t38-rx-reinvite-packet-count param in spandsp.conf

FS-9954: [freeswitch-core] Crash on switch_ivr_intercept_session due null pointer for buuid #resolve

FS-9975: [mod_sofia] add contact params to request uri of outbound recovery reinvite for originally inbound calls

FS-9970: [mod_sofia] don't detect nat in cases when the contact is in the acl, but the packet actually came from a proxy.  We need to check where we got the packet from as being a natted address instead of the contact in order to properly handle nat to our next hop