SERVER-14033 second half of rebase merge from  36d1beca1267a47cf4e9d79742caec8e5ad608fa