fix regression from 9074a1245564d19145e4d104f34d7286210bef22
FS-5717 --resolve

Conflicts:
	src/mod/endpoints/mod_sofia/mod_sofia.c
FS-5802 --resolve
ignore a= lines when m= port is 0

Conflicts:
	libs/sofia-sip/.update
FS-5812 --resolve
FS-5807 --resolve
Merge branch 'v1.2.stable' of git://git.freeswitch.org/freeswitch into v1.2.stable
Merge branch 'v1.2.stable' into stable-session-api
FS-5807 contd
FS-5806 please test HEAD
Merge branch 'v1.2.stable' of git://git.freeswitch.org/freeswitch into v1.2.stable
Merge branch 'v1.2.stable' into stable-session-api