Merge "Fix usage of MediaWikiServices in comments and documentation"