Update Wikidata build

see I69b26ac and I42d868c, bug 61915 and attempt to address bug 61914

Bug: 61915
Change-Id: Ib5f1f022afb853c7eb0a64d6f24fad768dc8f4b6