diff --git a/app/code/Magento/Store/Model/Scope/Validator.php b/app/code/Magento/Store/Model/Scope/Validator.php
index e0bb9289ba73a548b46900b02087a1cb0833ae6b..894301addcacaf80ce83299d25e0aecdd2371ff3 100644
--- a/app/code/Magento/Store/Model/Scope/Validator.php
+++ b/app/code/Magento/Store/Model/Scope/Validator.php
@@ -41,7 +41,7 @@ class Validator implements ValidatorInterface
 
         if ($scope === ScopeConfigInterface::SCOPE_TYPE_DEFAULT && !empty($scopeCode)) {
             throw new LocalizedException(__(
-                'The "%1" scope can’t include a scope code. Try again without entering a scope code.',
+                'The "%1" scope can\'t include a scope code. Try again without entering a scope code.',
                 ScopeConfigInterface::SCOPE_TYPE_DEFAULT
             ));
         }
@@ -56,9 +56,9 @@ class Validator implements ValidatorInterface
             $scopeResolver = $this->scopeResolverPool->get($scope);
             $scopeResolver->getScope($scopeCode)->getId();
         } catch (InvalidArgumentException $e) {
-            throw new LocalizedException(__('The "%1" value doesn’t exist. Enter another value.', $scope));
+            throw new LocalizedException(__('The "%1" value doesn\'t exist. Enter another value.', $scope));
         } catch (NoSuchEntityException $e) {
-            throw new LocalizedException(__('The "%1" value doesn’t exist. Enter another value."', $scopeCode));
+            throw new LocalizedException(__('The "%1" value doesn\'t exist. Enter another value."', $scopeCode));
         }
 
         return true;
diff --git a/app/code/Magento/Store/Test/Unit/Model/Scope/ValidatorTest.php b/app/code/Magento/Store/Test/Unit/Model/Scope/ValidatorTest.php
index c7a00eb2a4048f53bfcbfb7a6e377ff62f2737fa..300ebe9690493f886dda4879606f24907a87e503 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Scope/ValidatorTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Scope/ValidatorTest.php
@@ -64,7 +64,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage The "default" scope can’t include a scope code. Try again without entering a scope code.
+     * @expectedExceptionMessage The "default" scope can't include a scope code. Try again without entering a scope
      */
     public function testNotEmptyScopeCodeForDefaultScope()
     {
@@ -91,7 +91,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage The scope code can include only lowercase letters (a-z), numbers (0-9) and underscores (_). Also, the first character must be a letter.
+     * @expectedExceptionMessage The scope code can include only lowercase letters (a-z), numbers (0-9) and underscores
      */
     public function testWrongScopeCodeFormat()
     {
@@ -100,7 +100,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage The "not_default_scope" value doesn’t exist. Enter another value.
+     * @expectedExceptionMessage The "not_default_scope" value doesn't exist. Enter another value.
      */
     public function testScopeNotExist()
     {
@@ -115,7 +115,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage The "not_exist_scope_code" value doesn’t exist. Enter another value.
+     * @expectedExceptionMessage The "not_exist_scope_code" value doesn't exist. Enter another value.
      */
     public function testScopeCodeNotExist()
     {
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/PhpFormatter.php b/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/PhpFormatter.php
index 91bd906e3ca4d83438188e3131ba5e9537af939c..2fcd8b6d60b6123b82a771049ec5844c1df8ce40 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/PhpFormatter.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/PhpFormatter.php
@@ -25,7 +25,8 @@ class PhpFormatter implements FormatterInterface
             foreach ($data as $key => $value) {
                 $comment = '  ';
                 if (!empty($comments[$key])) {
-                    $comment = "  /**\n * " . str_replace("\n", "\n * ", var_export($comments[$key], true)) . "\n */\n";
+                    $exportedComment = trim(var_export($comments[$key], true), '\'');
+                    $comment = "  /**\n * " . str_replace("\n", "\n * ", $exportedComment) . "\n */\n";
                 }
                 $space = is_array($value) ? " \n" : ' ';
                 $elements[] = $comment . var_export($key, true) . ' =>' . $space . var_export($value, true);