It seems there were a few merge mistakes in wikidata, particularly in commit bb51a58e575b13eb8b6c496482f7066a7081f676 it seems.
I see at least the following were accidentally (partly) reverted for EditPage in master
4d4bfc27a1bedf6b0d1670707ac812fe36fe85ad (already fixed)
These were then merged from the wikidata branch back into master again it seems. I suggest that entire master->wikidata merge is double checked.