Merge remote-tracking branch 'origin/develop' into MQE-1379

# Conflicts:
#	src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php

Author: jilu1

src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php

@@ -21,7 +21,6 @@
 use Magento\FunctionalTestingFramework\Util\ConfigSanitizerUtil;
 use Yandex\Allure\Adapter\AllureException;
 use Magento\FunctionalTestingFramework\Util\Protocol\CurlTransport;
-use Symfony\Component\Process\Process;
 use Yandex\Allure\Adapter\Support\AttachmentSupport;
 use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
 use Magento\FunctionalTestingFramework\Config\MftfApplicationConfig;
@@ -522,13 +521,35 @@ public function scrollToTopOfPage()
      */
     public function magentoCLI($command, $timeout = null, $arguments = null)
     {
-        return $this->curlExecMagentoCLI($command, $timeout, $arguments);
-        //TODO: calling bin/magento from pipeline is timing out, needs investigation (ref: MQE-1774)
-//        try {
-//            return $this->shellExecMagentoCLI($command, $arguments);
-//        } catch (\Exception $exception) {
-//            return $this->curlExecMagentoCLI($command, $arguments);
-//        }
+        // Remove index.php if it's present in url
+        $baseUrl = rtrim(
+            str_replace('index.php', '', rtrim($this->config['url'], '/')),
+            '/'
+        );
+
+        $apiURL = UrlFormatter::format(
+            $baseUrl . '/' . ltrim(getenv('MAGENTO_CLI_COMMAND_PATH'), '/'),
+            false
+        );
+
+        $restExecutor = new WebapiExecutor();
+        $executor = new CurlTransport();
+        $executor->write(
+            $apiURL,
+            [
+                'token' => $restExecutor->getAuthToken(),
+                getenv('MAGENTO_CLI_COMMAND_PARAMETER') => $command,
+                'arguments' => $arguments,
+                'timeout'   => $timeout,
+            ],
+            CurlInterface::POST,
+            []
+        );
+        $response = $executor->read();
+        $restExecutor->close();
+        $executor->close();
+
+        return $response;
     }
 
     /**