🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - #15102: [Backport] Move customer.account.dashboard.info.extra block to contact information (by @sergiy-v)
 - #15106: [Backport] use "Module_Name::template/path" format instead of using template/path (by @sergiy-v)
 - #15066: [Backport] Add statement to 'beforeSave' method to allow app:config:import (by @rogyar)

Author: magento-engcom-team

app/code/Magento/Braintree/Model/Adminhtml/System/Config/CountryCreditCard.php

@@ -56,6 +56,13 @@ public function __construct(
     public function beforeSave()
     {
         $value = $this->getValue();
+        if (!is_array($value)) {
+            try {
+                $value = unserialize($value);
+            } catch (\InvalidArgumentException $e) {
+                $value = [];
+            }
+        }
         $result = [];
         foreach ($value as $data) {
             if (empty($data['country_id']) || empty($data['cc_types'])) {

app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml

@@ -20,6 +20,7 @@
                     <?php echo $block->escapeHtml($block->getName()) ?><br>
                     <?php echo $block->escapeHtml($block->getCustomer()->getEmail()) ?><br>
                 </p>
+                <?php echo $block->getChildHtml('customer.account.dashboard.info.extra'); ?>
             </div>
             <div class="box-actions">
                 <a class="action edit" href="<?php echo $block->escapeUrl($block->getUrl('customer/account/edit')) ?>">
@@ -43,8 +44,6 @@
                             <?php echo $block->escapeHtml(__('You don\'t subscribe to our newsletter.')) ?>
                         <?php endif; ?>
                     </p>
-                    <?php /* Extensions placeholder */ ?>
-                    <?php echo $block->getChildHtml('customer.account.dashboard.info.extra')?>
                 </div>
                 <div class="box-actions">
                     <a class="action edit" href="<?php echo $block->escapeUrl($block->getUrl('newsletter/manage')) ?>"><span><?php echo $block->escapeHtml(__('Edit')) ?></span></a>

app/code/Magento/Review/Block/Product/ReviewRenderer.php

@@ -18,8 +18,8 @@ class ReviewRenderer extends \Magento\Framework\View\Element\Template implements
      * @var array
      */
     protected $_availableTemplates = [
-        self::FULL_VIEW => 'helper/summary.phtml',
-        self::SHORT_VIEW => 'helper/summary_short.phtml',
+        self::FULL_VIEW => 'Magento_Review::helper/summary.phtml',
+        self::SHORT_VIEW => 'Magento_Review::helper/summary_short.phtml',
     ];
 
     /**