apache license
SERVER-6694 create unique index on files_id, n

C++ driver for GridFS should create unique index on files_id, n.
Use getLastErrorDetailed instead of getLastError
clarify error message.  in mongos if you get this message it's pretty unclear as a user what is wrong. added the lists of hosts for the clusterconnection so you know what specifically is down.  ideally we would say 'all config servers down: their_names' if that is what is wrong as that would be clearer but that would go somewhere up the stack so this is still suboptimal but an improvement.'
Fix for SERVER-7050
Conflicts:
	src/mongo/client/dbclient.cpp
	src/mongo/client/dbclientinterface.h
SERVER-7050 Fix Windows compile
SERVER-6802 allow trivial bulk insert for SCCs
clarification int he comments for the driver and tweak error message
don't include MONGO_MALLOC redef if we don't need it
make MONGO_MALLOC play nicer with headers
Log error object when replSetGetStatus fails in the ReplicaSetMonitor
buildbot compire error fix for SERVER-4706
buildbot compile fix for SERVER-4706 part 2
SERVER-4706 Fix buildbot compile failure on Linux client 64bit build
SERVER-4706 bbot compile fix for 32bit
SERVER-7666 make connPoolStats always report the state of all replica sets being tracked
Fix unused variable warning for shard_conn_test and scoped_db_conn_test
SERVER-939 simplify use of scoped distributed and balancer lock

Conflicts:
	src/mongo/SConscript
	src/mongo/client/distlock.cpp
SERVER-939 make scopedDbConnection take ConnectionStrings directly
SERVER-7848 ability to turn off lock pinger in testing