Add two startup options:

- --client_debug that turns out debug logging from the client
- --connect_timeout_secs that controls the timeout of the initial Ping() RPC from the client to the server

--
MOS_MIGRATED_REVID=138491791
diff --git a/src/main/cpp/startup_options.h b/src/main/cpp/startup_options.h
index db9bfb2..d0cd804 100644
--- a/src/main/cpp/startup_options.h
+++ b/src/main/cpp/startup_options.h
@@ -200,9 +200,15 @@
   // gRPC command server.
   int command_port;
 
+  // Connection timeout for each gRPC connection attempt.
+  int connect_timeout_secs;
+
   // Invocation policy proto. May be NULL.
   const char *invocation_policy;
 
+  // Whether to output addition debugging information in the client.
+  bool client_debug;
+
  protected:
   // Constructor for subclasses only so that site-specific extensions of this
   // class can override the product name.  The product_name must be the