Added a timeout on api url requests
  so that task is not blocked when we have a network issue.
fixed merge