SERVER-13620 update fassert code
Merge remote-tracking branch 'upstream/v2.6' into v2.6