SERVER-9038: fix test when not running with random mongod around
SERVER-12157: fix 32-bit compile
Merge remote-tracking branch 'upstream/master'