tamird Merge pull request #10530 from bdarnell/update-etcd …