Add wait index to Watch. Watch now returns null if etcd is unavailable. Remove use of tasks in Watch