Merge remote-tracking branch 'magento2/develop' into MAGETWO-32923

Author: Viktor Tymchynskyi

dev/tests/api-functional/framework/Magento/TestFramework/Authentication/Rest/OauthClient.php

@@ -24,6 +24,11 @@
  */
 class OauthClient extends AbstractService
 {
+    /**
+     * The maximum timeout for http request in seconds
+     */
+    const DEFAULT_TIMEOUT = 120;
+
     /** @var string|null */
     protected $_oauthVerifier = null;
 
@@ -36,6 +41,7 @@ public function __construct(
     ) {
         if (!isset($httpClient)) {
             $httpClient = new \OAuth\Common\Http\Client\StreamClient();
+            $httpClient->setTimeout(self::DEFAULT_TIMEOUT);
         }
         if (!isset($storage)) {
             $storage = new \OAuth\Common\Storage\Session();