SERVER-13839 circumvent reconfig in sync2.js
SERVER-13840 extend getMaster() timeout in stepdown2.js to cope with election timeout
Merge remote-tracking branch 'upstream/master'