Merge pull request #935 from w3c/jgraham/websockets_port_fixes

Make sure to include the port in websockets tests.
Fix W3C WebDriver to always send a valid request body

Signed-off-by: AutomatedTester <dburns@mozilla.com>
Fixup typo in canvas tests