Merge branch 'MAGETWO-52974-3' into QwertyPR20171107

Author: Dmytro Voskoboinikov

app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml

@@ -14,13 +14,13 @@
         "[data-role=swatch-options]": {
             "Magento_Swatches/js/swatch-renderer": {
                 "jsonConfig": <?= /* @escapeNotVerified */ $swatchOptions = $block->getJsonConfig() ?>,
-                "jsonSwatchConfig": <?php /* @escapeNotVerified */ echo $block->getJsonSwatchConfig(); ?>,
+                "jsonSwatchConfig": <?php /* @noEscape */ echo $block->getJsonSwatchConfig(); ?>,
                 "mediaCallback": "<?= /* @escapeNotVerified */ $block->getMediaCallback() ?>",
                 "gallerySwitchStrategy": "<?php /* @escapeNotVerified */ echo $block->getVar('gallery_switch_strategy',
                     'Magento_ConfigurableProduct') ?: 'replace'; ?>"
             },
             "Magento_Swatches/js/configurable-customer-data": {
-                    "swatchOptions": <?php /* @escapeNotVerified */ echo $swatchOptions ?>
+                    "swatchOptions": <?php /* @noEscape */ echo $swatchOptions ?>
             }
         }
     }