SERVER-13582 another attempt to fix server6733.js
(cherry picked from commit b32f849719c97dc9c73b22178329d4dda7ad1dd6)
Merge remote-tracking branch 'upstream/v2.6' into v2.6