SERVER-8869 mongos command passthrough for mergeChunks plus tests
SERVER-9993 Accept any numeric type for the maxSize field in config.shards
SERVER-10526 Fix improper use of temporary matched field name
Revert "SERVER-10507 Disable unittest failing on windows builds"

This reverts commit ca81b44e30d4803da3d6994d0278350ac02f3d88.
SERVER-10507 Resize vector after reading config file to match the number of bytes actually read
SERVER-6405: start putting all Collection things into Collection class
SERVER-6405: move CollectionIterator to structure
SERVER-6405: convert FlatIterator to new Collection model
SERVER-6405: don't throw away Collection* across yield
SERVER-6405: Collection instance lifecycle start
SERVER-6405: CappedIterator using new collection
Include pdfile.h to ensure DiskLoc::obj is defined
SERVER-8364 removed excess #IFDEF directives

Signed-off-by: Matt Kangas <matt.kangas@10gen.com>