SERVER-13620 fix assert codes to be the same as in 2.6
Merge remote-tracking branch 'upstream/master'