Add appropriate support for websocket proxying

Change-Id: I30001ecbab31ee805b7ba8217537cabb192a5f1e
Merge "Add appropriate support for websocket proxying" into production