more fine grained ElectionTimeout also takes i into account
when discovering a new master take their n
Merge remote-tracking branch 'refs/remotes/origin/election-timeout' into 1.7
Merge remote-tracking branch 'refs/remotes/origin/take-n-from-new-master' into 1.7