SERVER-13635: make capped8 a bit more generous as we push more data through now
Merge remote-tracking branch 'upstream/master'