SERVER-14680 remove incomplete unit test
SERVER-14378 fix duplicate assert codes
Merge remote-tracking branch 'upstream/master'