Merge branch 'MAGETWO-63479' of github.com:magento-troll/magento2ce into MAGETWO-58456

Author: slopukhov

app/code/Magento/Rule/Model/AbstractModel.php

@@ -95,6 +95,7 @@ abstract public function getActionsInstance();
      * @param ExtensionAttributesFactory|null $extensionFactory
      * @param AttributeValueFactory|null $customAttributeFactory
      * @param \Magento\Framework\Serialize\Serializer\Json $serializer
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,

app/code/Magento/Rule/Test/Unit/Model/AbstractModelTest.php

@@ -10,6 +10,8 @@
  * Class AbstractModelTest. Unit test for \Magento\Rule\Model\AbstractModel
  *
  * @package Magento\Rule\Test\Unit\Model
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AbstractModelTest extends \PHPUnit_Framework_TestCase
 {