Merge "Increase default waiter retries and timeout"