Merge "Sync up with Parsoid parserTests.txt"

diff --combined tests/parser/parserTests.txt
index d476373,a291958..2064e03
--- 1/tests/parser/parserTests.txt
--- 2/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@@ -4338,12 -4338,12 +4338,12 @@@ Definition Lists: Mixed Lists: Test 1
  !! test
  Definition Lists: Mixed Lists: Test 11
  !! wikitext
- ;a
- :*b
- !! html
- <dl><dt>a</dt>
+ ; a
+ :* b
+ !! html/*
+ <dl><dt> a</dt>
  <dd>
- <ul><li>b</li></ul></dd></dl>
+ <ul><li> b</li></ul></dd></dl>
  
  !! end
  
@@@ -29305,7 -29305,7 +29305,7 @@@ Decoding of HTML entities in headings a
  [[#A&B&amp;C&amp;amp;D&amp;amp;amp;E]]
  !! html/php
  <h2><span class="mw-headline" id="A.26B.26C.26amp.3BD.26amp.3Bamp.3BE">A&amp;B&amp;C&amp;amp;D&amp;amp;amp;E</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: A&amp;B&amp;C&amp;amp;D&amp;amp;amp;E">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
 -<p><a href="#A.26B.26C.26D.26amp.3BE">#A&amp;B&amp;C&amp;amp;D&amp;amp;amp;E</a>
 +<p><a href="#A.26B.26C.26amp.3BD.26amp.3Bamp.3BE">#A&amp;B&amp;C&amp;amp;D&amp;amp;amp;E</a>
  </p>
  !! end