Merge branch 'develop' into FearlessKiwi-MAGETWO-59948

* develop:
  MAGETWO-61104: [Magento Cloud] - Deleting image in the admin panel deletes it in the server and causes error for other products

Author: VenkataUppalapati

app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php

@@ -29,7 +29,10 @@ protected function processDeletedImages($product, array &$images)
             if (!empty($image['removed'])) {
                 if (!empty($image['value_id']) && !isset($picturesInOtherStores[$image['file']])) {
                     $recordsToDelete[] = $image['value_id'];
-                    $filesToDelete[] = ltrim($image['file'], '/');
+                    // only delete physical files if they are not used by any other products
+                    if (!$this->resourceModel->countImageUses($image['file']) > 1) {
+                        $filesToDelete[] = ltrim($image['file'], '/');
+                    }
                 }
             }
         }

app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php

@@ -449,4 +449,21 @@ public function getProductImages($product, $storeIds)
 
         return $this->getConnection()->fetchAll($select);
     }
+
+    /**
+     * Counts uses of this image.
+     *
+     * @param string $image
+     * @return int
+     */
+    public function countImageUses($image)
+    {
+        $select = $this->getConnection()->select()
+            ->from([$this->getMainTableAlias() => $this->getMainTable()])
+            ->where(
+                'value = ?',
+                $image
+            );
+        return count($this->getConnection()->fetchAll($select));
+    }
 }

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/GalleryTest.php

@@ -443,4 +443,33 @@ public function testDeleteGalleryValueInStore()
 
         $this->resource->deleteGalleryValueInStore($valueId, $entityId, $storeId);
     }
+
+    public function testCountImageUses()
+    {
+        $results = [
+            [
+                'value_id' => '1',
+                'attribute_id' => 90,
+                'value' => '/d/o/download_7.jpg',
+                'media_type' => 'image',
+                'disabled' => '0',
+            ],
+        ];
+
+        $this->connection->expects($this->once())->method('select')->will($this->returnValue($this->select));
+        $this->select->expects($this->at(0))->method('from')->with(
+            [
+                'main' => 'table',
+            ],
+            '*'
+        )->willReturnSelf();
+        $this->select->expects($this->at(1))->method('where')->with(
+            'value = ?',
+            1
+        )->willReturnSelf();
+        $this->connection->expects($this->once())->method('fetchAll')
+            ->with($this->select)
+            ->willReturn($results);
+        $this->assertEquals($this->resource->countImageUses(1), count($results));
+    }
 }