Merge remote-tracking branch 'origin/MAGETWO-35242' into develop

Author: Roman Ganin

app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php

@@ -11,20 +11,20 @@
 class Upload extends \Magento\Backend\App\Action
 {
     /**
-     * @var \Magento\Framework\Controller\Result\JsonFactory
+     * @var \Magento\Framework\Controller\Result\RawFactory
      */
-    protected $resultJsonFactory;
+    protected $resultRawFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
     ) {
         parent::__construct($context);
-        $this->resultJsonFactory = $resultJsonFactory;
+        $this->resultRawFactory = $resultRawFactory;
     }
 
     /**
@@ -36,7 +36,7 @@ protected function _isAllowed()
     }
 
     /**
-     * @return \Magento\Framework\Controller\Result\Json
+     * @return \Magento\Framework\Controller\Result\Raw
      */
     public function execute()
     {
@@ -72,6 +72,10 @@ public function execute()
             $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
         }
 
-        return $this->resultJsonFactory->create()->setData($result);
+        /** @var \Magento\Framework\Controller\Result\Raw $response */
+        $response = $this->resultRawFactory->create();
+        $response->setHeader('Content-type', 'text/plain');
+        $response->setContents(json_encode($result));
+        return $response;
     }
 }