applying CR-only changes again (1)
Cherry-pick [Bug 21971]

Pulling:
https://github.com/w3c/html/commit/72d8faaa484bc35c3b4d208ef4a1c0b1c9b5c767
into the CR branch
(cherry picked from commit 05d1f3f4f7002c0e12ce719c4acef39abfb5a85d)
[e] (0) Closer integration with encoding.spec.whatwg.org
Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=22661
Affected topics: HTML, HTML Syntax and Parsing, Security

git-svn-id: http://svn.whatwg.org/webapps@8081 340c8d12-0b0e-0410-8428-c7bf67bfef74
(cherry picked from commit 53b2304d6440d527345d7d410a6b35ce28d7d1b4)
(cherry picked from commit c50f7280a75b26ea779a22a1c908df3afa8c09e7)
(cherry picked from commit 8b67cf8f28edb2e207b621e49c8e4ed62f7363f9)

Conflicts:
	source
applying CR-only changes again (2)