Missing default_rpc_timeout in the upstream/master