Merge "Make LoadBalancer::waitFor() and friends more robust via try/finally"