MAGETWO-37464: Merge and Fix Builds

- Fix test

Author: Bryant Luk

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php

@@ -314,8 +314,8 @@ public function testProductWithMediaGallery()
         $testImagePath = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'test_image.jpg';
         $encodedImage = base64_encode(file_get_contents($testImagePath));
         //create a product with media gallery
-        $filename1 = 'tiny1' . time();
-        $filename2 = 'tiny2' . time();
+        $filename1 = 'tiny1' . time() . '.jpg';
+        $filename2 = 'tiny2' . time() . '.jpeg';
         $productData = $this->getSimpleProductData();
         $productData['media_gallery_entries'] = [
             [
@@ -355,14 +355,14 @@ public function testProductWithMediaGallery()
                 'position' => 1,
                 'disabled' => true,
                 'types' => [],
-                'file' => '/t/i/' . $filename1 . '.jpg',
+                'file' => '/t/i/' . $filename1,
             ],
             [
                 'label' => 'tiny2',
                 'position' => 2,
                 'disabled' => false,
                 'types' => ['image', 'small_image'],
-                'file' => '/t/i/' . $filename2 . '.jpg',
+                'file' => '/t/i/' . $filename2,
             ],
         ];
         $this->assertEquals($expectedValue, $mediaGalleryEntries);
@@ -374,7 +374,7 @@ public function testProductWithMediaGallery()
                 'position' => 1,
                 'disabled' => false,
                 'types' => ['image', 'small_image'],
-                'file' => '/t/i/' . $filename1 . '.jpg',
+                'file' => '/t/i/' . $filename1,
             ],
         ];
         $response = $this->updateProduct($response);
@@ -387,7 +387,7 @@ public function testProductWithMediaGallery()
                 'position' => 1,
                 'disabled' => false,
                 'types' => ['image', 'small_image'],
-                'file' => '/t/i/' . $filename1 . '.jpg',
+                'file' => '/t/i/' . $filename1,
             ]
         ];
         $this->assertEquals($expectedValue, $mediaGalleryEntries);