Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-84311-magento-magento2-12133

Author: Stanislav Idolov

setup/performance-toolkit/benchmark.jmx

@@ -8006,14 +8006,15 @@ try {
 
     //Number of products for one thread
     productClusterLength = productCount / threadsNumber;
-    //Index of the current product from the cluster
-    i = productClusterLength * currentThreadNum + iterator;
 
     if (iterator >= productClusterLength) {
     	vars.put("threadIterator_" + currentThreadNum.toString(), "0");
     	iterator = 0;
     }
 
+    //Index of the current product from the cluster
+    i = productClusterLength * currentThreadNum + iterator;
+
     //ids of simple and configurable products to edit
     vars.put("simple_product_id", props.get("simple_products_list").get(i).get("id"));
     vars.put("configurable_product_id", props.get("configurable_products_list").get(i).get("id"));