am 1e964ed8: am d6bbc544: Merge "Harden against transiently unavailable backup...
am 1e964ed8: am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev
* commit '1e964ed8':
Harden against transiently unavailable backup transports