Merge PR from Bug 1080491 fix-answered-elsewhere (backport)

Bug 1080491 — Fix "answered-elsewhere" impl.
Conflicts:
	loadtests/loadtest.py
	loop/websockets.js
	test/storage_test.js
	test/websockets_test.js