Bug 1610422 part 1. Pull in missing upstream changes for RTCPeerConnection-ondatachannel.html. r=jgraham

It looks like most of the changes from
https://github.com/web-platform-tests/wpt/pull/16038 we have already, except
some whitespace bits.

Differential Revision: https://phabricator.services.mozilla.com/D60469