Sync up core repo with Parsoid
This now aligns with Parsoid commit 16e27722c6c50618c78230952c1ad27948fc3a0b
Change-Id: I21067c1b22a494422184abf7c4bb50424b4fad56