Merge "filebackend: deprecate FileBackend::getWikiId()"

diff --combined RELEASE-NOTES-1.34
index 8ecc469,06cd3d3..d9ad6da
--- 1/RELEASE-NOTES-1.34
--- 2/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@@ -92,6 -92,8 +92,6 @@@ For notes on 1.33.x and older releases
    to add fields to Special:Mute.
  * (T100896) Skin authors can define custom OOUI themes using OOUIThemePaths.
    See <https://www.mediawiki.org/wiki/OOUI/Themes> for details.
 -* The HtmlCacheUpdater service was added to unify the logic of purging CDN cache
 -  and HTML file cache to simplify callers and make them more consistent.
  
  === External library changes in 1.34 ===
  
@@@ -413,6 -415,8 +413,8 @@@ because of Phabricator reports
    template option 'searchaction' instead.
  * LoadBalancer::haveIndex() and LoadBalancer::isNonZeroLoad() have
    been deprecated.
+ * FileBackend::getWikiId() has been deprecated.
+   Use FileBackend::getDomainId() instead.
  * User::getRights() and User::$mRights have been deprecated. Use
    PermissionManager::getUserPermissions() instead.
  * The LocalisationCacheRecache hook no longer allows purging of message blobs
@@@ -435,6 -439,7 +437,6 @@@
  * SearchEngine::textAlreadyUpdatedForIndex() is deprecated, given the
    deprecation above this method is no longer needed/called and should not be
    implemented by SearchEngine implementation.
 -* Title::purgeSquid is deprecated. Use MediaWikiServices::getHtmlCacheUpdater.
  
  === Other changes in 1.34 ===
  * …