CXX-457 Backport server 2.8.0-rc3..2.8.0-rc4 changes