etcd: use old default data-dir format
Merge pull request #1407 from bcwaldon/old-data-dir

etcd: use old default data-dir format