Merge remote-tracking branch 'origin/MAGETWO-42825' into MPI-BUGFIXES

Author: Viktor Tymchynskyi

app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml

@@ -84,13 +84,13 @@ require(["prototype"], function(){
                 'carriers_ups_mode_xml'];
             this.onlyUpsElements = ['carriers_ups_gateway_url'];
 
-            this.storedOriginShipment = '<?php /* @escapeNotVerified */ echo $storedOriginShipment ?>';
-            this.storedFreeShipment = '<?php /* @escapeNotVerified */ echo $storedFreeShipment ?>';
-            this.storedUpsType = '<?php /* @escapeNotVerified */ echo $storedUpsType ?>';
+            this.storedOriginShipment = '<?php /* @noEscape */ echo $storedOriginShipment ?>';
+            this.storedFreeShipment = '<?php /* @noEscape */ echo $storedFreeShipment ?>';
+            this.storedUpsType = '<?php /* @noEscape */ echo $storedUpsType ?>';
             <?php /** @var $jsonHelper \Magento\Framework\Json\Helper\Data */ $jsonHelper = $this->helper('Magento\Framework\Json\Helper\Data'); ?>
-            this.storedAllowedMethods = <?php /* @escapeNotVerified */ echo $jsonHelper->jsonEncode($storedAllowedMethods) ?>;
-            this.originShipmentObj = <?php /* @escapeNotVerified */ echo $jsonHelper->jsonEncode($orShipArr) ?>;
-            this.originShipmentObj['default'] = <?php /* @escapeNotVerified */ echo $jsonHelper->jsonEncode($defShipArr) ?>;
+            this.storedAllowedMethods = <?php /* @noEscape */ echo $jsonHelper->jsonEncode($storedAllowedMethods) ?>;
+            this.originShipmentObj = <?php /* @noEscape */ echo $jsonHelper->jsonEncode($orShipArr) ?>;
+            this.originShipmentObj['default'] = <?php /* @noEscape */ echo $jsonHelper->jsonEncode($defShipArr) ?>;
 
             this.setFormValues();
             Event.observe($(this.carriersUpsTypeId), 'change', this.setFormValues.bind(this));