MAGETWO-38686: Merge and Fix Builds

- fix integration tests

Author: arkadiych

dev/tests/integration/testsuite/Magento/Framework/Composer/RemoveTest.php

@@ -11,7 +11,13 @@ class RemoveTest extends \PHPUnit_Framework_TestCase
 {
     public function testRemove()
     {
-        $composerApp = $this->getMock('Composer\Console\Application', [], [], '', false);
+        $composerApp = $this->getMock(
+            'Composer\Console\Application',
+            ['setAutoExit', 'resetComposer', 'run'],
+            [],
+            '',
+            false
+        );
         $directoryList = $this->getMock('Magento\Framework\App\Filesystem\DirectoryList', [], [], '', false);
         $directoryList->expects($this->once())->method('getRoot');
         $directoryList->expects($this->once())