SERVER-16434 extend timeout for election wait in rollback_auth.js
Merge remote-tracking branch 'upstream/master'