SERVER-11875 Fix for compatibility with old config servers
Merge remote-tracking branch 'upstream/master'