Made some etcd.yaml changes to get unblocked.

[aaronmfraser]

I made some changes. Most important was making the list items under container: a list. Some other changes are probably less important to function but I pasted my working yaml in the "all combined" area.