* Upgrade timeout to 30s * Fix #2378 * Revert "Upgrade timeout to 30s" This reverts commit 366a9dd34b.
366a9dd34b