Merge "Allow resources to be salvaged across service resets."

diff --cc autoload.php
Simple merge

diff --cc includes/MediaWikiServices.php
index d423212,3d48419..4028aa2
--- 1/includes/MediaWikiServices.php
--- 2/includes/MediaWikiServices.php
+++ b/includes/MediaWikiServices.php
@@@ -8,12 -8,11 +8,13 @@@ use GenderCache
  use GlobalVarConfig;
  use Hooks;
  use LBFactory;
 +use LinkCache;
  use Liuggio\StatsdClient\Factory\StatsdDataFactory;
  use LoadBalancer;
+ use MediaWiki\Services\SalvageableService;
  use MediaWiki\Services\ServiceContainer;
  use MWException;
 +use ObjectCache;
  use ResourceLoader;
  use SearchEngine;
  use SearchEngineConfig;

diff --cc includes/Setup.php
Simple merge

diff --cc tests/phpunit/includes/MediaWikiServicesTest.php
index a45c3ae,cbb6059..0e646ea
--- 1/tests/phpunit/includes/MediaWikiServicesTest.php
--- 2/tests/phpunit/includes/MediaWikiServicesTest.php
+++ b/tests/phpunit/includes/MediaWikiServicesTest.php
@@@ -1,7 -1,8 +1,9 @@@
  <?php
  use Liuggio\StatsdClient\Factory\StatsdDataFactory;
 +use MediaWiki\Interwiki\InterwikiLookup;
  use MediaWiki\MediaWikiServices;
+ use MediaWiki\Services\DestructibleService;
+ use MediaWiki\Services\SalvageableService;
  use MediaWiki\Services\ServiceDisabledException;
  
  /**