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

Author: Viktor Tymchynskyi

app/code/Magento/Braintree/view/frontend/templates/creditcard/edit.phtml

@@ -328,7 +328,7 @@ $serializedFormData = $this->helper('Magento\Framework\Json\Helper\Data')->jsonE
             </label>
 
             <div class="control">
-                <?php echo $block->escapeHtml($block->countrySelect('credit_card[billing_address][country_code_alpha2]', 'billing_address_country', $default)); ?>
+                <?php /* @noEscape */ echo $block->countrySelect('credit_card[billing_address][country_code_alpha2]', 'billing_address_country', $default); ?>
             </div>
         </div>
     </fieldset>