Merge "undo misguided changes to phpunit" into Wikidata