Improve EtcdConfig fallback logic