Merge "Sync up with Parsoid parserTests."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 5 Jan 2017 21:49:41 +0000 (21:49 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 5 Jan 2017 21:49:41 +0000 (21:49 +0000)

Trivial merge