add more retries for canary and preview auth tests that sometimes fail.
Merge branch 'master' into batch-incidents