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