added timeout retry on uncached http requests
Merge branch 'master' into 2.6.0