comment on writeback change
SERVER-939 Introduced more collection and fields names constants.

Conflicts:
	src/mongo/s/balance.cpp
	src/mongo/s/balancer_policy_tests.cpp
	src/mongo/s/d_migrate.cpp
	src/mongo/s/d_split.cpp
	src/mongo/s/grid.cpp
SERVER-939 Introduced type for config.collection docs.
SERVER-939 Included generic bson header (fix compile)
SERVER-939 Corrected bson ownership (fixed unit test)
remove some rand() calls, and use Random instead

Conflicts:
	src/mongo/s/chunk.cpp
	src/mongo/s/d_writeback.cpp
	src/mongo/s/d_writeback.h
SERVER-939 Changed FieldParser to have the correct BSON ownership semantics.
include time info in splitvector

Conflicts:
	src/mongo/s/d_split.cpp
SERVER-939 Added field type constants for config.locks collection

Conflicts:
	src/mongo/client/distlock.cpp
kill newnear, allow >1 special index type

Conflicts:
	jstests/geo_s2near.js
	src/mongo/bson/bsonobj.h
	src/mongo/db/geo/s2index.cpp
	src/mongo/db/matcher.cpp
	src/mongo/db/query_optimizer_internal.cpp
	src/mongo/db/queryutil.cpp
	src/mongo/db/queryutil.h
SERVER-939 Introduced types for config.databases and config.chunks collections.
SERVER-939 Added field type constants for config.lockpings collection
SERVER-939 Introduced type for config.shards collection.
use condition instead of hard loop for critical section

Conflicts:
	src/mongo/s/d_migrate.cpp
	src/mongo/s/d_state.cpp
SERVER-7739 make GLE work with mongos dropDatabase

Conflicts:
	jstests/sharding/read_pref_cmd.js
Revert "SERVER-7739 make GLE work with mongos dropDatabase"

This reverts commit 08b96ce551d867c8de54a25ea2692744e14f3caf.

Conflicts:
	jstests/sharding/read_pref_cmd.js
SERVER-939 Added field type constants for config.mongos collection
SERVER-939 Added field type constants for config.changelog collection
SERVER-6490 fix bug with _id array vals.

When sharding on _id, we were not properly invalidating docs that had
an array value for the shard key. Instead we were trying to add an _id
field, even though the doc already had one.

Conflicts:
	src/mongo/s/strategy_shard.cpp
SERVER-939 new CollectionManager and MetadataLoader classes (not yet hooked).