etcdserver: collapse dir configuration to DataDir