SERVER-15535 remove redundant test
SERVER-15198 fix merge issue
Merge remote-tracking branch 'upstream/master'