MAGETWO-50681: Merge mainline develop branch and stabilize bamboo builds

Author: slopukhov

app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php

@@ -377,7 +377,7 @@ public function getConfigurableAttributes($product)
             ['group' => 'CONFIGURABLE', 'method' => __METHOD__]
         );
         if (!$product->hasData($this->_configurableAttributes)) {
-            $cacheId =  __CLASS__ . $product->getId();
+            $cacheId =  __CLASS__ . $product->getId() . '_' . $product->getStoreId();
             $configurableAttributes = $this->cache->load($cacheId);
             if ($configurableAttributes) {
                 $configurableAttributes = unserialize($configurableAttributes);
@@ -595,7 +595,7 @@ public function beforeSave($product)
     public function save($product)
     {
         parent::save($product);
-        $cacheId =  __CLASS__ . $product->getId();
+        $cacheId =  __CLASS__ . $product->getId() . '_' . $product->getStoreId();
         $this->cache->remove($cacheId);
 
         $extensionAttributes = $product->getExtensionAttributes();