Migrate gatewayd changes to staging

also includes some small revisions for websocket docs