Update Wikidata, fix conflict in mw.templates

Change-Id: Iaee5c7f43b0845a9d083aeec3d47cca199516141