Sync etcd client

... and sprinkle it around here - the universe remains in balance (more-or-less).