SERVER-15595 fix unittest link error
Merge remote-tracking branch 'upstream/master'