SERVER-12448 c++11 doesn't like passing WorkingSetID::INVALID_ID to .resize so stop doing that
Merge remote-tracking branch 'upstream/master'