Merge remote-tracking branch 'origin/develop' into MAGETWO-47254

Author: zanilee

app/code/Magento/AdminNotification/composer.json

@@ -10,7 +10,7 @@
         "lib-libxml": "*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc2",
+    "version": "100.1.0-rc3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/AdvancedPricingImportExport/composer.json

@@ -13,7 +13,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc2",
+    "version": "100.1.0-rc3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Authorization/composer.json

@@ -7,7 +7,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc2",
+    "version": "100.1.0-rc3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Authorizenet/composer.json

@@ -13,7 +13,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc2",
+    "version": "100.1.0-rc3",
     "license": [
         "proprietary"
     ],

app/code/Magento/Backend/composer.json

@@ -22,7 +22,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc2",
+    "version": "100.1.0-rc3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Backup/Model/Fs/Collection.php

@@ -110,7 +110,10 @@ protected function _generateRow($filename)
             $row[$key] = $value;
         }
         $row['size'] = $this->_varDirectory->stat($this->_varDirectory->getRelativePath($filename))['size'];
-        $row['id'] = $row['time'] . '_' . $row['type'];
+        if (isset($row['display_name']) && $row['display_name'] == '') {
+            $row['display_name'] = 'WebSetupWizard';
+        }
+        $row['id'] = $row['time'] . '_' . $row['type'] . (isset($row['display_name']) ? $row['display_name'] : '');
         return $row;
     }
 }

app/code/Magento/Backup/composer.json

@@ -9,7 +9,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc2",
+    "version": "100.1.0-rc3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Braintree/composer.json

@@ -23,7 +23,7 @@
         "magento/module-checkout-agreements": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc2",
+    "version": "100.1.0-rc3",
     "license": [
         "proprietary"
     ],

app/code/Magento/Bundle/composer.json

@@ -25,7 +25,7 @@
         "magento/module-bundle-sample-data": "Sample Data version:100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc2",
+    "version": "100.1.0-rc3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/BundleImportExport/composer.json

@@ -11,7 +11,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc2",
+    "version": "100.1.0-rc3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"