SERVER-16209 test fix
Merge remote-tracking branch 'upstream/master'