Merge branch '2.2.2-develop' of https://github.com/magento-qwerty/magento2ce into MAGETWO-83152

Author: Oleksandr Gorkun

.htaccess

@@ -355,6 +355,15 @@
             Require all denied
         </IfVersion>
     </Files>
+    <Files auth.json>
+        <IfVersion < 2.4>
+            order allow,deny
+            deny from all
+        </IfVersion>
+        <IfVersion >= 2.4>
+            Require all denied
+        </IfVersion>
+    </Files>
     <Files magento_umask>
         <IfVersion < 2.4>
             order allow,deny

.htaccess.sample

@@ -332,6 +332,15 @@
             Require all denied
         </IfVersion>
     </Files>
+    <Files auth.json>
+        <IfVersion < 2.4>
+            order allow,deny
+            deny from all
+        </IfVersion>
+        <IfVersion >= 2.4>
+            Require all denied
+        </IfVersion>
+    </Files>
     <Files magento_umask>
         <IfVersion < 2.4>
             order allow,deny

app/code/Magento/Analytics/composer.json

@@ -4,10 +4,10 @@
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
         "magento/module-backend": "100.2.*",
-        "magento/module-config": "100.2.*",
+        "magento/module-config": "101.0.*",
         "magento/module-integration": "100.2.*",
         "magento/module-store": "100.2.*",
-        "magento/framework": "100.2.*"
+        "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
     "version": "100.2.0",

app/code/Magento/Braintree/composer.json

@@ -18,7 +18,7 @@
         "magento/module-quote": "101.0.*",
         "magento/module-paypal": "100.2.*",
         "magento/module-ui": "101.0.*",
-        "braintree/braintree_php": "3.22.0"
+        "braintree/braintree_php": "3.25.0"
     },
     "suggest": {
         "magento/module-checkout-agreements": "100.2.*",

app/code/Magento/CatalogAnalytics/composer.json

@@ -3,8 +3,8 @@
     "description": "N/A",
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.2.*",
-        "magento/module-catalog": "101.1.*"
+        "magento/framework": "101.0.*",
+        "magento/module-catalog": "102.0.*"
     },
     "type": "magento2-module",
     "version": "100.2.0",

app/code/Magento/CustomerAnalytics/composer.json

@@ -3,8 +3,8 @@
     "description": "N/A",
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.2.*",
-        "magento/module-customer": "100.2.*"
+        "magento/framework": "101.0.*",
+        "magento/module-customer": "101.0.*"
     },
     "type": "magento2-module",
     "version": "100.2.0",

app/code/Magento/InstantPurchase/composer.json

@@ -16,7 +16,7 @@
     "magento/module-shipping": "100.2.*",
     "magento/module-quote": "101.0.*",
     "magento/module-vault": "101.0.*",
-    "magento/framework": "100.2.*"
+    "magento/framework": "101.0.*"
   },
   "autoload": {
     "files": [

app/code/Magento/QuoteAnalytics/composer.json

@@ -3,8 +3,8 @@
     "description": "N/A",
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.2.*",
-        "magento/module-quote": "100.2.*"
+        "magento/framework": "101.0.*",
+        "magento/module-quote": "101.0.*"
     },
     "type": "magento2-module",
     "version": "100.2.0",

app/code/Magento/ReviewAnalytics/composer.json

@@ -3,7 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.2.*",
+        "magento/framework": "101.0.*",
         "magento/module-review": "100.2.*"
     },
     "type": "magento2-module",

app/code/Magento/SalesAnalytics/composer.json

@@ -3,8 +3,8 @@
     "description": "N/A",
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/framework": "100.2.*",
-        "magento/module-sales": "100.2.*"
+        "magento/framework": "101.0.*",
+        "magento/module-sales": "101.0.*"
     },
     "type": "magento2-module",
     "version": "100.2.0",