Merge pull request #1146 in FS/freeswitch from bugfix/FS-9206-proxy-media-with-enable...

* commit 'a597e216bc699567ddb77d1765cf095c3bb31183':
  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

diff --cc src/mod/endpoints/mod_sofia/mod_sofia.c
Simple merge

diff --cc src/mod/endpoints/mod_sofia/sofia.c
Simple merge

diff --cc src/switch_core_media.c
Simple merge