CXX-457 Backport server r2.8.0-rc3..r2.8.0-rc4 changes