Add timeout for http, set to 300secs.  Fix logic on retry