am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev

* commit 'd6bbc54423c0fb70e9e0415b3e8c12a435d715a1':
  Harden against transiently unavailable backup transports