Add websocket debug logging
Update web.xml to work in cluster
Merge branch 'master' into workspace-workqueue