Merge "EtcdConfig: Fix infinite timeout bug, and reduce timeout"