Conflicts:
	src/switch_core_cert.c

FS-10183 [mod_sofia] Broadsoft Shared line pickup would fall if a-leg is PCMU and your pickup device has G722 as its first codec.

Resolves FS-10071. Fixed newer (perl 5.22 and up) versions of perl from crashing, -e means evaluate the following string and it does not like emptystr.

Conflicts:
	libs/libks/src/kws.c
	libs/sofia-sip/.update

Conflicts:
	html5/verto/video_demo/js/verto-min.js

FS-10146: [mod_conference] Completely setup conference member before adding them to the conference #resolve

FS-9704: [mod_av] Seeking video files with mod_av after it reaches the end does not work fix regression

FS-10088: [freeswitch-core] Backports backport video modification functions to fix a seg in conference caused by backporting FS-10107

FS-10091: [mod_conference] Conference play file with full-screen=true has side effect on member video

FS-10118: [freeswitch-core] Race conditions from lack of error checking in switch_core_session_read_lock #resolve

Conflicts:
	src/switch_core_media.c

Conflicts:
	src/switch_core_media.c