MAGETWO-37464: Merge and Fix Builds

- Fixed static tests
- Fixed to use correct SOAP operation for customer update

Author: anupdugar

app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php

@@ -14,7 +14,8 @@
 
 /**
  * Class BackendAuthentication
- * @package Magento\Rss\App\Action\Plugin
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class BackendAuthentication extends \Magento\Backend\App\Action\Plugin\Authentication
 {
@@ -51,6 +52,7 @@ class BackendAuthentication extends \Magento\Backend\App\Action\Plugin\Authentic
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\AuthorizationInterface $authorization
      * @param array $aclResources
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Backend\Model\Auth $auth,
@@ -70,8 +72,16 @@ public function __construct(
         $this->logger = $logger;
         $this->authorization = $authorization;
         $this->aclResources = $aclResources;
-        parent::__construct($auth, $url, $response, $actionFlag, $messageManager, $backendUrl, $resultRedirectFactory,
-            $backendAppList);
+        parent::__construct(
+            $auth,
+            $url,
+            $response,
+            $actionFlag,
+            $messageManager,
+            $backendUrl,
+            $resultRedirectFactory,
+            $backendAppList
+        );
     }
 
     /**

dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementCustomAttributesTest.php

@@ -258,9 +258,9 @@ public function testUpdateCustomerWithImageAttribute()
                 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
             ],
             'soap' => [
-                'service' => self::SERVICE_NAME,
+                'service' => 'customerCustomerRepositoryV1',
                 'serviceVersion' => self::SERVICE_VERSION,
-                'operation' => self::SERVICE_NAME . 'Save',
+                'operation' => 'customerCustomerRepositoryV1Save',
             ],
         ];
         $customerData = $this->_webApiCall($serviceInfo, $requestData);