SERVER-15228 Make awaitReplication properly detect NotMaster conditions
Merge remote-tracking branch 'upstream/master'