replSet-aware connection string
Merge branch 'master' into feature/CAP-1222