CXX-448 Backport server 2.8.0-rc2..2.8.0-rc3 changes