SERVER-15420 Fix potential race in coming out of maintenance mode
Merge remote-tracking branch 'upstream/master'