Some fixes:

- Used "wikidata" instead of both "wikidatawiki" and "testwikidatawiki" where
possible
- Sorted
- Removed dbname where group already has the value

Change-Id: I67e7da43db5ec8698cef2c98947d589c64cc7c23