SERVER-12041 improve retry logic for read preferences without slaveOk set
Merge remote-tracking branch 'upstream/v2.4' into v2.4