Switch to etcd's new command arg names
Add support for snapshot argument