Update after SPR-10796 fix + polish

WebSocketConnectionManager now allows setting headers so there is
no longer a need for the custom code setting the origin header.

Also did some polish, consolidating WebSocket-related classes into
a single package and adding Tomcat8/Glassfish4 deployment scripts.