Fix test for WebSocket support

This fixes a regression introduced by ab94539.
Fix SCM URL in POM
Merge branch '2.0'