Merge "set start and stop timeout in etcd service"