Merge "Sync up with Parsoid parserTests.txt"