Small cleanups and increased logging to diagnose SERVER-15082
Merge remote-tracking branch 'upstream/master'