Use https client for timeline uploading
Merge branch 'master' into builds
7.22