SERVER-14413 fix assert code collision w/enterprise
Merge remote-tracking branch 'upstream/master'