update Wikibase with some backports

Change-Id: Ib1a69ee3f77331a0b76159ae3b770b7a03ecb8da