SERVER-9765 use election time to resolve 2-primary situation, as a stopgap
Merge remote-tracking branch 'upstream/master'