Merge "EtcdConfig: allow slashes in config key names"