Merge branch 'magento-commerce:develop' into ACQE-2580

Author: mohit-adobe

src/Magento/FunctionalTestingFramework/Console/DoctorCommand.php

@@ -198,7 +198,7 @@ private function runMagentoWebDriverDoctor()
  unset($settings['modules']['config'][$magentoWebDriver]);
 
  $dispatcher = new EventDispatcher();
- $suiteManager = new SuiteManager($dispatcher, self::SUITE, $settings);
+ $suiteManager = new SuiteManager($dispatcher, self::SUITE, $settings, []);
  try {
  $suiteManager->initialize();
  $this->context = ['Successful'];

src/Magento/FunctionalTestingFramework/Module/MagentoWebDriverDoctor.php

@@ -91,8 +91,8 @@ private function connectToSeleniumServer()
  $this->capabilities,
  $this->connectionTimeoutInMs,
  $this->requestTimeoutInMs,
- $this->httpProxy,
- $this->httpProxyPort
+ $this->config['http_proxy'],
+ $this->config['http_proxy_port']
  );
  if (null !== $this->remoteWebDriver) {
  return;