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