Add failed merge. Add browser role support in Websocket transport and fix Websocket TLS alternative send methods. Part of https://java.net/jira/browse/JSIP-432 and https://java.net/jira/browse/JSIP-465

git-svn-id: https://svn.java.net/svn/jsip~svn/trunk@2322 8e71dc83-d81e-6649-80f2-80b843a9b2be