Merge commit 'df01deaacff82b918b4f0ba774d5ad3087543629' * commit 'df01deaacff82b918b4f0ba774d5ad3087543629': More restore plumbing, plus add suggested-backoff to transport API
Merge commit 'df01deaacff82b918b4f0ba774d5ad3087543629' * commit 'df01deaacff82b918b4f0ba774d5ad3087543629': More restore plumbing, plus add suggested-backoff to transport API