Merge "Make ports_client use common waiter method"