more fine grained ElectionTimeout also takes i into account

Looks good on CI