rebase

comm-central/patches/TOP-1614671-port1456035-4-and-5-61a1-cc.patch

@@ -1893,7 +1893,7 @@ diff --git a/suite/mailnews/content/mailWindow.js b/suite/mailnews/content/mailW
 diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/content/mailWindowOverlay.js
 --- a/suite/mailnews/content/mailWindowOverlay.js
 +++ b/suite/mailnews/content/mailWindowOverlay.js
-@@ -1317,26 +1317,20 @@ BatchMessageMover.prototype =
+@@ -1319,26 +1319,20 @@ BatchMessageMover.prototype =
          aFolder.name == this._dstFolderName)
      {
        this._dstFolderParent = null;

mozilla-central/patches/1659298-extensions-moz-v1_1-mc.patch

@@ -7,7 +7,7 @@ Bug 1659298 - Get rid of distribution extensions in favor of application global
 diff --git a/config/rules.mk b/config/rules.mk
 --- a/config/rules.mk
 +++ b/config/rules.mk
-@@ -887,19 +887,19 @@ endif
+@@ -904,19 +904,19 @@ endif
  
  # See comment above about moving this out of the tools tier.
  ifdef INSTALL_EXTENSION_ID