Expand @RequestScoped and @SessionScoped to account for WebSocket

We've been testing injection into a WebSocket endpoint.

@ReqestScoped objects are usable within the @OnOpen callback. This is because this object is executed within a valid request scope.

However if you try to use the injected object from within the @OnMessage callback you get a Weld error:
SEVERE: org.jboss.weld.context.ContextNotActiveException:
WELD-001303 No active contexts for scope type javax.enterprise.context.RequestScoped

Can the definition of when @RequestScoped is active be expanded to include a WebSocket @OnMessage callback?