SERVER-16455 do not start election while in hbreconfig state
Merge remote-tracking branch 'upstream/master'