Merge "Revert "Sync up with Parsoid parserTests.""