Merge "Add getStatsdDataFactory to MediawikiServices"

diff --combined includes/DefaultSettings.php
index f2370ad,f5b3caa..08084f4
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -2589,13 -2589,6 +2589,13 @@@ $wgCdnMaxageLagged = 30
   */
  $wgCdnReboundPurgeDelay = 0;
  
 +/**
 + * Cache timeout for the CDN when a response is known to be wrong or incomplete (due to load)
 + * @see $wgSquidMaxage
 + * @since 1.27
 + */
 +$wgCdnMaxageSubstitute = 60;
 +
  /**
   * Default maximum age for raw CSS/JS accesses
   *
@@@ -5903,7 -5896,7 +5903,7 @@@ $wgStatsdServer = false
  /**
   * Prefix for metric names sent to $wgStatsdServer.
   *
-  * @see RequestContext::getStats
+  * @see MediaWikiServices::getStatsdDataFactory
   * @see BufferingStatsdDataFactory
   * @since 1.25
   */