Merge in s2s branch, all fingers crossed

git-svn-id: https://svn.apache.org/repos/asf/mina/vysper/trunk@1054817 13f79535-47bb-0310-9956-ffa450edef68
68 files changed