Merge branch '2.1' of github.com:magento/magento2ce into sprint15_2.1

Author: rganin

app/code/Magento/Checkout/view/frontend/web/js/sidebar.js

@@ -246,6 +246,7 @@ define([
                 target = $(this.options.minicart.list),
                 outerHeight;
 
+            self.scrollHeight = 0;
             target.children().each(function () {
 
                 if ($(this).find('.options').length > 0) {
@@ -259,7 +260,7 @@ define([
                 self.scrollHeight += outerHeight;
             });
 
-            target.height(height);
+            target.parent().height(height);
         }
     });
 

dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductsStep.php

@@ -60,7 +60,7 @@ public function __construct(FixtureFactory $fixtureFactory, $products, array $da
     public function run()
     {
         $products = [];
-        $productsDataSets = explode(',', $this->products);
+        $productsDataSets = is_array($this->products) ? $this->products : explode(',', $this->products);
         foreach ($productsDataSets as $key => $productDataSet) {
             $productDataSet = explode('::', $productDataSet);
             $fixtureClass = $productDataSet[0];