Remove etcd_leader job

* Provide each etcd instance with all other etcd IPs
* loggregator.etcd_ips -> etcd.machines
* hm9000.etcd_ips -> etcd.machines

Replace leader job with an additional etcd_z1 instance
in templates. Had to use an additional static ip for this
instance so as not to conflict with the old leader job
during deploy.

Signed-off-by: Max Brunsfeld <mbrunsfeld@pivotallabs.com>