Revert "Remove 60 second timeout for etcd"
Revert "Remove 60 second timeout for etcd"

This reverts commit ee8206395ca9a1ca8c958ef60148128b95d1f396.

cloudfoundry-incubator/lattice,cloudfoundry-incubator/lattice,cloudfoundry-incubator/lattice-release,cloudfoundry-incubator/lattice-release,cloudfoundry-incubator/lattice-release,cloudfoundry-incubator/lattice,cloudfoundry-incubator/lattice,cloudfoundry-incubator/lattice-release