MAGETWO-36818: Merge and Fix builds

 - Code style changes to fix static test failures

Author: marcozheng

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

@@ -436,6 +436,7 @@ protected function _addSubMenu($menuItem, $level, $limit, $id = null)
      * @param array $colBrakes
      * @return string HTML
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
     {

lib/internal/Magento/Framework/Reflection/Test/Unit/ExtensionAttributesProcessorTest.php

@@ -9,16 +9,16 @@
 use Magento\Framework\Api\Config\Converter;
 use Magento\Framework\Api\Config\Reader;
 use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Framework\Reflection\ExtensionAttributesProcessor;
 use Magento\Framework\Reflection\FieldNamer;
 use Magento\Framework\Reflection\MethodsMap;
 use Magento\Framework\Reflection\TypeCaster;
-use Magento\Framework\Reflection\TypeProcessor;
 
 /**
  * ExtensionAttributesProcessor test
  */
-class ExtensionsAttributesProcessorTest extends \PHPUnit_Framework_TestCase
+class ExtensionAttributesProcessorTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var ExtensionAttributesProcessor
@@ -28,12 +28,12 @@ class ExtensionsAttributesProcessorTest extends \PHPUnit_Framework_TestCase
     /**
      * @var DataObjectProcessor
      */
-    private $dataObjectProcessor;
+    private $dataObjectProcessorMock;
 
     /**
      * @var MethodsMap
      */
-    private $methodsMapProcessor;
+    private $methodsMapProcessorMock;
 
     /**
      * @var FieldNamer
@@ -169,5 +169,4 @@ public function buildOutputDataArrayWithPermissionProvider()
             ],
         ];
     }
-
 }