CXX-437 Backport server 2.8.0-rc1..2.8.0-rc2 changes

I can't tell if "e" would be considered unused here or not. Obviously throw re-throws the current exception but would this produce a warning?