Fix maxWaitTime on errors based on whether endpoint(service or socket was reachable or not)

Fix maxWaitTime on errors based on whether endpoint(service or socket was reachable or not) #31055