Improve etcd peer discovery lease and locking mechanism

The current code in etcd peer discovery does not handle some edge cases, where etcd lock can be lost between faults. Without a keep-alive process, the lock can be silently lost.