Incorporating review comments

Changing timeout for HttpClientFactory shutdown to 10 seconds