Merge remote-tracking branch 'origin/MAGETWO-80207' into PR-2.2.2-develop

Author: VladimirZaets

app/code/Magento/Deploy/Package/Bundle/RequireJs.php

@@ -240,9 +240,12 @@ private function endBundleFile(WriteInterface $bundleFile, array $contents)
     private function getFileContent($sourcePath)
     {
         if (!isset($this->fileContent[$sourcePath])) {
-            $this->fileContent[$sourcePath] = utf8_encode(
-                $this->staticDir->readFile($this->minification->addMinifiedSign($sourcePath))
-            );
+            $content = $this->staticDir->readFile($this->minification->addMinifiedSign($sourcePath));
+            if (mb_detect_encoding($content) !== "UTF-8") {
+                $content = mb_convert_encoding($content, "UTF-8");
+            }
+
+            $this->fileContent[$sourcePath] = $content;
         }
         return $this->fileContent[$sourcePath];
     }

lib/internal/Magento/Framework/View/Asset/Bundle.php

@@ -212,7 +212,11 @@ protected function getAssetContent(LocalInterface $asset)
         $assetContentType = $asset->getContentType();
         $assetKey = $this->getAssetKey($asset);
         if (!isset($this->assetsContent[$assetContextCode][$assetContentType][$assetKey])) {
-            $this->assetsContent[$assetContextCode][$assetContentType][$assetKey] = utf8_encode($asset->getContent());
+            $content = $asset->getContent();
+            if (mb_detect_encoding($content) !== "UTF-8") {
+                $content = mb_convert_encoding($content, "UTF-8");
+            }
+            $this->assetsContent[$assetContextCode][$assetContentType][$assetKey] = $content;
         }
 
         return $this->assetsContent[$assetContextCode][$assetContentType][$assetKey];