Merge https://java.net/jira/browse/JSIP-478 contributed by fre

git-svn-id: https://svn.java.net/svn/jsip~svn@2351 8e71dc83-d81e-6649-80f2-80b843a9b2be
Merge https://java.net/jira/browse/JSIP-469 contributed by fre

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