Make etcd timeouts configurable

also change deprecated --peer-heartbeat-timeout to
--per-heartbeat-interval.