MAGETWO-51801: PR Creation & Stabilization

- L3 fix.

Author: Hayder Sharhan

app/code/Magento/Directory/Model/CountryInformationAcquirer.php

@@ -130,7 +130,6 @@ protected function setCountryInfo($country, $regions, $storeLocale)
         $countryInfo->setFullNameLocale($country->getName($storeLocale));
         $countryInfo->setFullNameEnglish($country->getName('en_US'));
 
-
         if (array_key_exists($countryId, $regions)) {
             $regionsInfo = [];
             foreach ($regions[$countryId] as $id => $regionData) {

app/code/Magento/Theme/view/frontend/templates/html/header.phtml

@@ -15,7 +15,8 @@ $welcomeMessage = $block->getWelcome();
     case 'welcome': ?>
         <li class="greet welcome" data-bind="scope: 'customer'">
             <!-- ko if: customer().fullname  -->
-            <span data-bind="text: new String('<?php echo __('Welcome, %1!', '%1');?>').replace('%1', customer().firstname)"></span>
+            <span data-bind="text: new String('<?php echo $block->escapeHtml(__('Welcome, %1!', '%1'));?>').replace('%1', customer().firstname)">
+            </span>
             <!-- /ko -->
             <!-- ko ifnot: customer().fullname  -->
             <span data-bind="html:'<?=$block->escapeHtml($welcomeMessage) ?>'"></span>