Merge branch 'sofia/openssl-socket-context' into sofia/openssl-socket-session