CXX-255 Backport server r2.7.1..r2.7.2 changes

No review required, really, just putting this through the workflow...