MAGETWO-37464: Merge and Fix Builds

- Refactored to use the updated attribute name for ImageContent

Author: anupdugar

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

@@ -326,7 +326,7 @@ public function testProductWithMediaGallery()
                 'content' => [
                     'type' => 'image/jpeg',
                     'name' => $filename1,
-                    'entry_data' => $encodedImage,
+                    'base64_encoded_data' => $encodedImage,
                 ]
             ],
             [
@@ -337,7 +337,7 @@ public function testProductWithMediaGallery()
                 'content' => [
                     'type' => 'image/jpeg',
                     'name' => $filename2,
-                    'entry_data' => $encodedImage,
+                    'base64_encoded_data' => $encodedImage,
                 ]
             ],
         ];