Merge "Revert "Make WatchedItemStore use MediaWikiServices""