Merge remote-tracking branch 'origin/MAGETWO-95122' into 2.2-develop-pr62

Author: svitja

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php

@@ -328,7 +328,7 @@ public function testGetUrlPath()
         $actualResults = $this->getActualUrlPaths($categoryFilter);
         $categoryExpectedResult = [
             ['category-1/category-1-1/category-1-1-1.html', 'catalog/category/view/id/5', 1],
-            ['category-1/category-1-1/url-key.html', 'catalog/category/view/id/5', 2],
+            ['category-1/category-1-1/url-key.html', 'catalog/category/view/id/5', $storeId],
         ];
 
         $this->assertResults($categoryExpectedResult, $actualResults);
@@ -348,7 +348,7 @@ public function testGetUrlPath()
         $actualResults = $this->getActualUrlPaths($categoryFilter);
         $categoryExpectedResult = [
             ['category-1/category-1-1/category-1-1-1.html', 'catalog/category/view/id/5', 1],
-            ['category-1/category-1-1/category-1-1-1.html', 'catalog/category/view/id/5', 2],
+            ['category-1/category-1-1/category-1-1-1.html', 'catalog/category/view/id/5', $storeId],
         ];
 
         $this->assertResults($categoryExpectedResult, $actualResults);