MAGETWO-90552: Merge release branch into 2.2-develop

- Fixed merge conflicts

Author: aakimov

app/code/Magento/Catalog/view/adminhtml/web/js/category-checkbox-tree.js

@@ -31,7 +31,6 @@ define([
             data = {},
             parameters = {},
             root = {},
-            len = 0,
             key = '';
 
         /* eslint-disable */

dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php

@@ -52,37 +52,6 @@ private function getWhitelist(): array
         return $this->blockWhitelist;
     }
 
-    /**
-     * @var string[]|null
-     */
-    private $blockWhitelist;
-
-    /**
-     * Return whitelist class names
-     *
-     * @return string[]
-     */
-    private function getWhitelist(): array
-    {
-        if ($this->blockWhitelist === null) {
-            $whiteListFiles = str_replace(
-                '\\',
-                '/',
-                realpath(__DIR__) . '/_files/whitelist/public_code*.txt'
-            );
-            $whiteListItems = [];
-            foreach (glob($whiteListFiles) as $fileName) {
-                $whiteListItems = array_merge(
-                    $whiteListItems,
-                    file($fileName, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)
-                );
-            }
-            $this->blockWhitelist = $whiteListItems;
-        }
-
-        return $this->blockWhitelist;
-    }
-
     /**
      * Since blocks can be referenced from templates, they should be stable not to break theme customizations.
      * So all blocks should be @api annotated. This test checks that all blocks declared in layout files are public