Merge commit 'refs/pull/3/head' of https://github.com/magento/magento2ce into epam-3-1

Author: Andrey Konosov

app/code/Magento/BundleImportExport/composer.json

@@ -3,16 +3,16 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-catalog": "0.74.0-beta11",
-        "magento/module-import-export": "0.74.0-beta11",
-        "magento/module-catalog-import-export": "0.74.0-beta11",
-        "magento/module-bundle": "0.74.0-beta11",
-        "magento/module-eav": "0.74.0-beta11",
-        "magento/framework": "0.74.0-beta11",
+        "magento/module-catalog": "0.74.0-beta12",
+        "magento/module-import-export": "0.74.0-beta12",
+        "magento/module-catalog-import-export": "0.74.0-beta12",
+        "magento/module-bundle": "0.74.0-beta12",
+        "magento/module-eav": "0.74.0-beta12",
+        "magento/framework": "0.74.0-beta12",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta11",
+    "version": "0.74.0-beta12",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php

@@ -624,7 +624,7 @@ public function execute()
                     $pathSize  = count($structure);
                     if ($pathSize > 1) {
                         $path = [];
-                        for ($i = 0; $i < $pathSize; $i++) {
+                        for ($i = 1; $i < $pathSize; $i++) {
                             $path[] = $category->load($structure[$i])->getName();
                         }
                         array_shift($path);
@@ -645,7 +645,7 @@ public function execute()
             return $result[$index % count($result)][0];
         };
         $productCategory = function ($index) use ($result) {
-            return $result[$index % count($result)][1];
+            return $result[$index % count($result)][2] . '/' . $result[$index % count($result)][1];
         };
 
         /**