Merge remote-tracking branch 'origin/2.1-develop' into MAGETWO-67162

Author: OlgaVasyltsun

app/code/Magento/Backend/Block/Menu.php

@@ -211,9 +211,12 @@ protected function _renderItemCssClass($menuItem, $level)
     protected function _renderAnchor($menuItem, $level)
     {
         if ($level == 1 && $menuItem->getUrl() == '#') {
-            $output = '<strong class="submenu-group-title" role="presentation">'
-                . '<span>' . $this->_getAnchorLabel($menuItem) . '</span>'
-                . '</strong>';
+            $output = '';
+            if ($menuItem->hasChildren()) {
+                $output = '<strong class="submenu-group-title" role="presentation">'
+                    . '<span>' . $this->_getAnchorLabel($menuItem) . '</span>'
+                    . '</strong>';
+            }
         } else {
             $output = '<a href="' . $menuItem->getUrl() . '" ' . $this->_renderItemAnchorTitle(
                 $menuItem

app/code/Magento/UrlRewrite/Block/Catalog/Product/Edit.php

@@ -55,7 +55,7 @@ protected function _prepareLayoutFeatures()
         }
 
         if ($this->_getProduct()->getId()) {
-            $this->_addProductLinkBlock($this->_getProduct());
+            $this->_addProductLinkBlock();
         }
 
         if ($this->_getCategory()->getId()) {

app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php

@@ -39,7 +39,7 @@ class Generator extends AbstractSchemaGenerator
     const UNAUTHORIZED_DESCRIPTION = '401 Unauthorized';
 
     /** Array signifier */
-    const ARRAY_SIGNIFIER = '[]';
+    const ARRAY_SIGNIFIER = '[0]';
 
     /**
      * Swagger factory instance.

lib/internal/Magento/Framework/Data/SearchResultProcessor.php

@@ -188,8 +188,8 @@ public function toArray($arrRequiredFields = [])
     }
 
     /**
-     * @param null $valueField
-     * @param null $labelField
+     * @param string|null $valueField
+     * @param string|null $labelField
      * @param array $additional
      * @return array
      */