Merge "MWServices load new ServiceWiringFiles after ExtRegistry load"

diff --combined includes/MediaWikiServices.php
index 53be334,3a95676..ba8b71b
--- 1/includes/MediaWikiServices.php
--- 2/includes/MediaWikiServices.php
+++ b/includes/MediaWikiServices.php
@@@ -3,7 -3,6 +3,7 @@@ namespace MediaWiki
  
  use Config;
  use ConfigFactory;
 +use CryptHKDF;
  use CryptRand;
  use EventRelayerGroup;
  use GenderCache;
@@@ -183,7 -182,7 +183,7 @@@ class MediaWikiServices extends Service
  
                $oldInstance = self::$instance;
  
-               self::$instance = self::newInstance( $bootstrapConfig );
+               self::$instance = self::newInstance( $bootstrapConfig, 'load' );
                self::$instance->importWiring( $oldInstance, [ 'BootstrapConfig' ] );
  
                if ( $quick === 'quick' ) {
@@@ -533,14 -532,6 +533,14 @@@
                return $this->getService( 'CryptRand' );
        }
  
 +      /**
 +       * @since 1.28
 +       * @return CryptHKDF
 +       */
 +      public function getCryptHKDF() {
 +              return $this->getService( 'CryptHKDF' );
 +      }
 +
        /**
         * @since 1.28
         * @return MediaHandlerFactory