Merge remote-tracking branch 'origin/temp' into temp

src/main/resources/application-dev.yml

@@ -22,8 +22,8 @@ hystrix:
             timeoutInMilliseconds: 20000
 
 ribbon:
-  ReadTimeout: 20000
-  ConnectTimeout: 20000
+  ReadTimeout: 2000000
+  ConnectTimeout: 2000000
   MaxAutoRetries: 0
   MaxAutoRetriesNextServer: 1