CXX-197 Backport server r2.6.0..r2.6.1 changes

There shouldn't be anything controversial here, lets have a quick look and release as 2.6.1.