SERVER-13439 fix nopreallocj option
Merge remote-tracking branch 'upstream/master'