INT-3515: Fix some WebSockets issues

JIRA: https://jira.spring.io/browse/INT-3515