CXX-382 Merge server 2.7.8..2.8.0-rc0 fixes

Mostly for rubber stamp, but someone should give this a quick look to make sure...