Merge "Add missing imports to MediaWikiServices"