Fix SERVER-2114 fix patch. Applies and compiles on r2.6.0-rc0.