Merge "rdbms: make LoadBalancer::waitForAll() better respect the timeout"