Bug 1063703: Assume ws if websocket is true.
Merge pull request #4737 from mrunalp/bugs/1063703

Merged by openshift-bot