Sync etcd client

I'd say no need for empty lines for forward declarations, but no big deal.