Merge remote-tracking branch 'origin/MAGETWO-35241' into bugfix

Author: Andrii Kasian

app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml

@@ -25,7 +25,7 @@
     <ul data-mage-init='{"menu":[]}'>
         <% if (data.items.length) { %>
         <% _.each(data.items, function(value){ %>
-        <li <%- data.optionData(value) %>><a href="#"><%- value.label %></a></li>
+        <li <%= data.optionData(value) %>><a href="#"><%- value.label %></a></li>
         <% }); %>
         <% } else { %><span class="mage-suggest-no-records"><%- data.noRecordsText %></span><% } %>
     </ul>
@@ -50,7 +50,7 @@
                 data: {'template_id': data.id}
             });
         });
-        
+
         $suggest.mage('suggest', <?php echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getSelectorOptions())?>)
             .on('suggestselect', function (e, ui) {
                 $(this).val('');