Tidy up ApiWikibase

Change-Id: I232a29267cd03b44e76986238c0d2888ffa96cfe
Merge "Tidy up ApiWikibase"