S2s fixes. Thanks for doing this. I am experimenting with websockets for Openfire s2s and I need these fixes.
