Merge forwardport of #12133 to 2.3-develop branch

Applied pull request patch https://github.com/magento/magento2/pull/12133.patch (created by @erfanimani) based on commit(s):
  1. cfab448

Fixed GitHub Issues in 2.3-develop branch:
  - #12127: Apostrophe in attribute option value in admin is not handled properly (reported by @erfanimani)

Author: magento-engcom-team

Diff for: app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml

@@ -88,7 +88,9 @@ $stores = $block->getStoresSortedBySortOrder();
     $values = [];
     foreach($block->getOptionValues() as $value) {
         $value = $value->getData();
-        $values[] = is_array($value) ? array_map("htmlspecialchars_decode", $value) : $value;
+        $values[] = is_array($value) ? array_map(function($str) {
+            return htmlspecialchars_decode($str, ENT_QUOTES);
+        }, $value) : $value;
     }
     ?>
     <script type="text/x-magento-init">

Diff for: dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute/Options.xml

@@ -22,5 +22,12 @@
                 <item name="admin" xsi:type="string">white</item>
             </field>
         </dataset>
+
+        <dataset name="option_with_single_quotation">
+            <field name="0" xsi:type="array">
+                <item name="is_default" xsi:type="string">Yes</item>
+                <item name="admin" xsi:type="string">test option with single\&apos;</item>
+            </field>
+        </dataset>
     </repository>
 </config>

Diff for: dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml

@@ -208,5 +208,16 @@
             <data name="productAttribute/data/is_comparable" xsi:type="string">Yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeIsUnique" />
         </variation>
+        <variation name="CreateProductAttributeEntityTestVariation10" summary="Create custom dropdown attribute with single quotation in option">
+            <data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
+            <data name="productAttribute/data/frontend_label" xsi:type="string">Dropdown_Admin_%isolation%</data>
+            <data name="productAttribute/data/frontend_input" xsi:type="string">Dropdown</data>
+            <data name="productAttribute/data/options/dataset" xsi:type="string">option_with_single_quotation</data>
+            <data name="productAttribute/data/is_required" xsi:type="string">Yes</data>
+            <data name="productAttribute/data/attribute_code" xsi:type="string">attr_dropdown_%isolation%</data>
+            <data name="productAttribute/data/is_global" xsi:type="string">Global</data>
+            <data name="productAttribute/data/is_unique" xsi:type="string">No</data>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertAttributeForm" />
+        </variation>
     </testCase>
 </config>