CXX-242 Backport server 2.7.1 to driver legacy branch